summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-03-13 14:06:10 +0000
committerThierry Vignaud <tv@mandriva.org>2008-03-13 14:06:10 +0000
commit5fd3b0aed1eb9d928ab0b8c8d2d4ae75bf2a2a0d (patch)
treec43deb69dcd49fbf6e4f451a194aaf20f42f17dd
parent0558ac759860e8ad78eb3079a40e3075562ad9e3 (diff)
downloadurpmi-5fd3b0aed1eb9d928ab0b8c8d2d4ae75bf2a2a0d.tar
urpmi-5fd3b0aed1eb9d928ab0b8c8d2d4ae75bf2a2a0d.tar.gz
urpmi-5fd3b0aed1eb9d928ab0b8c8d2d4ae75bf2a2a0d.tar.bz2
urpmi-5fd3b0aed1eb9d928ab0b8c8d2d4ae75bf2a2a0d.tar.xz
urpmi-5fd3b0aed1eb9d928ab0b8c8d2d4ae75bf2a2a0d.zip
sync with code
-rw-r--r--po/af.po186
-rw-r--r--po/ar.po195
-rw-r--r--po/az.po197
-rw-r--r--po/bg.po193
-rw-r--r--po/bn.po195
-rw-r--r--po/br.po190
-rw-r--r--po/bs.po200
-rw-r--r--po/ca.po209
-rw-r--r--po/cs.po314
-rw-r--r--po/cy.po927
-rw-r--r--po/da.po276
-rw-r--r--po/de.po215
-rw-r--r--po/el.po213
-rw-r--r--po/eo.po203
-rw-r--r--po/es.po203
-rw-r--r--po/et.po213
-rw-r--r--po/eu.po311
-rw-r--r--po/fa.po199
-rw-r--r--po/fi.po202
-rw-r--r--po/fr.po214
-rw-r--r--po/fur.po205
-rw-r--r--po/ga.po176
-rw-r--r--po/gl.po210
-rw-r--r--po/he.po245
-rw-r--r--po/hi.po203
-rw-r--r--po/hr.po192
-rw-r--r--po/hu.po1011
-rw-r--r--po/id.po209
-rw-r--r--po/is.po200
-rw-r--r--po/it.po359
-rw-r--r--po/ja.po194
-rw-r--r--po/ka.po188
-rw-r--r--po/ko.po189
-rw-r--r--po/ky.po203
-rw-r--r--po/lt.po203
-rw-r--r--po/lv.po187
-rw-r--r--po/mk.po203
-rw-r--r--po/mn.po191
-rw-r--r--po/ms.po188
-rw-r--r--po/mt.po195
-rw-r--r--po/nb.po202
-rw-r--r--po/nl.po218
-rw-r--r--po/nn.po287
-rw-r--r--po/pa_IN.po199
-rw-r--r--po/pl.po338
-rw-r--r--po/pt.po330
-rw-r--r--po/pt_BR.po206
-rw-r--r--po/ro.po205
-rw-r--r--po/ru.po907
-rw-r--r--po/sc.po203
-rw-r--r--po/sk.po207
-rw-r--r--po/sl.po201
-rw-r--r--po/sq.po201
-rw-r--r--po/sr.po197
-rw-r--r--po/sr@Latn.po197
-rw-r--r--po/sv.po198
-rw-r--r--po/tg.po207
-rw-r--r--po/th.po187
-rw-r--r--po/tl.po211
-rw-r--r--po/tr.po199
-rw-r--r--po/uk.po206
-rw-r--r--po/urpmi.pot168
-rw-r--r--po/uz.po199
-rw-r--r--po/uz@cyrillic.po195
-rw-r--r--po/vi.po201
-rw-r--r--po/wa.po209
-rw-r--r--po/zh_CN.po191
-rw-r--r--po/zh_TW.po192
68 files changed, 9559 insertions, 7108 deletions
diff --git a/po/af.po b/po/af.po
index ebb7d6b8..1dc023f8 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +87,85 @@ msgstr "Kanselleer"
msgid "Choose location to save file"
msgstr "Kies 'n lêer"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi uitgawe %s\n"
+"Kopiereg (C) 1999-2008 Mandriva.\n"
+"Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
+"GPL.\n"
+"\n"
+"gebruik:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - druk hierdie help boodskap.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
+#, c-format
+msgid " --media - use only the given media, separated by comma.\n"
+msgstr ""
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Geen opdrag gespesifiseer nie"
@@ -248,6 +326,11 @@ msgstr "Geïnstalleer"
msgid "removing %s"
msgstr "verwyder %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, fuzzy, c-format
+msgid "restarting urpmi"
+msgstr "Begin slurpd: "
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -398,7 +481,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Aanteken gevaal"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "Rekening bestaan reeds\n"
@@ -857,6 +947,11 @@ msgstr "Redigeer media \"%s\":"
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -910,7 +1005,12 @@ msgstr "Konfigurasie-lêer"
msgid "reconfiguration done"
msgstr "Bedienerkonfigurasie"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr ""
@@ -1169,13 +1269,6 @@ msgstr ""
"\n"
"gebruik:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - druk hierdie help boodskap.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1204,11 +1297,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
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 ""
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1572,12 +1660,6 @@ msgstr "Wys outogeselekteerde pakkette."
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1678,29 +1760,6 @@ msgstr " (J/n) "
msgid "Removal failed"
msgstr "Aanteken gevaal"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi uitgawe %s\n"
-"Kopiereg (C) 1999-2008 Mandriva.\n"
-"Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
-"GPL.\n"
-"\n"
-"gebruik:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1708,12 +1767,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1816,11 +1869,6 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1893,20 +1941,6 @@ msgid ""
" next arg.\n"
msgstr ""
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2217,12 +2251,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "Kanselleer"
-#: ../urpmi:665
+#: ../urpmi:635
#, fuzzy, c-format
-msgid "restarting urpmi"
-msgstr "Begin slurpd: "
+msgid "Press Enter when mounted..."
+msgstr "Druk ENTER wanneer u reg is..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2905,10 +2939,6 @@ msgstr "Geen beeld gevind nie"
#~ 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"
diff --git a/po/ar.po b/po/ar.po
index f7b2d391..26908faf 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +108,89 @@ msgstr "ال_غاء"
msgid "Choose location to save file"
msgstr "اختر مكان حفظ الملف"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi إصدارة %s\n"
+"حقّ النّسخ 1999-2008 ماندريبا.\n"
+"هذا برنامج حرّ و يمكن إعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
+"\n"
+"الاستعمال:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - اختر الحزم آليا لترقية النظام.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - أجبر التنفيذ حتى إن لم تكن بعض الحزم موجودة.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - تأكّد من توقيع rpm قبل التّثبيت\n"
+" (--no-verify-rpm يعطّل هذا الخيار، وهو ممكّن بشكل "
+"افتراضي.)\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - استخدم جذر آخر لتثبيت حزم rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - تحقّق إن كان بالإمكان التثبيت بشكل صحيح.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - استخدم فقط الوسط المُعطى للبحث عن الحزم المطلوبة (أو "
+"المُحدّثة).\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "لا توجد حزمة بالإسم %s"
@@ -268,6 +350,11 @@ msgstr "انتهى التثبيت"
msgid "removing %s"
msgstr "جاري إزالة %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "إعادة تشغيل urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -418,7 +505,14 @@ msgstr ""
msgid "Copying failed"
msgstr "فشل النّسخ"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "الوسيط \"%s\" غير مختار"
@@ -881,6 +975,11 @@ msgstr "جاري ازالة الوسيط \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -934,7 +1033,12 @@ msgstr "...فشلت إعادة التّهيئة"
msgid "reconfiguration done"
msgstr "تمّت إعادة التّهيئة"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "الوسيط \"%s\" غير مختار"
@@ -1192,13 +1296,6 @@ msgstr ""
"\n"
"الاستعمال:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - تطبع رسالة المساعدة هذه.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1227,11 +1324,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - استخدم جذر آخر لتثبيت حزم rpm.\n"
-#: ../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"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1592,12 +1684,6 @@ msgstr " --auto - قم باختيار حزمة آلياَ في الاخ
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - تحقق إن كان بالإمكان الإزالة بشكل صحيح.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - أجبر التنفيذ حتى إن لم تكن بعض الحزم موجودة.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1696,30 +1782,6 @@ msgstr " (ن/ل)"
msgid "Removal failed"
msgstr "فشلت عملية الإزالة"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi إصدارة %s\n"
-"حقّ النّسخ 1999-2008 ماندريبا.\n"
-"هذا برنامج حرّ و يمكن إعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
-"\n"
-"الاستعمال:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - استخدم فقط الوسط المُعطى للبحث عن الحزم المطلوبة (أو "
-"المُحدّثة).\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1727,12 +1789,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - اختر الحزم آليا لترقية النظام.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1843,11 +1899,6 @@ msgstr ""
" --allow-force - اسمح بسؤال المستخدم عن تثبيت الحزم دون\n"
" التّحقّق من المعتمدات والتّكامل.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - استخدم جذر آخر لتثبيت حزم rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1932,23 +1983,6 @@ msgstr ""
" --bug - أخرج تقرير خطأ في الدّليل المحدّد. "
"بالكلمة التالية.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - تأكّد من توقيع rpm قبل التّثبيت\n"
-" (--no-verify-rpm يعطّل هذا الخيار، وهو ممكّن بشكل "
-"افتراضي.)\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - تحقّق إن كان بالإمكان التثبيت بشكل صحيح.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2264,12 +2298,12 @@ msgstr[3] ""
msgid "Cancel"
msgstr "إلغاء"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "إعادة تشغيل urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "اضغط Enter عند الاستعداد..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3010,9 +3044,6 @@ msgstr "لم يُعثر على سجلّ تغييرات\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/az.po b/po/az.po
index 92468d18..5c45f34c 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +110,90 @@ msgstr "_Ləğv Et"
msgid "Choose location to save file"
msgstr "Qeyd ediləcək ünvanı seçin"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi buraxılış %s\n"
+"Müəllif Hüququ (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"istifadə qaydası:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - bu kömək ismarışını çap edər.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - sistemi yeniləmək üçün paketləri avtomatik seç.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - bəzi paketlər mövcud olmasa belə istəməyə zorla.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - qurmadan əvvəl rpm imzasını yoxla\n"
+" (--no-verify-rpm bunu qeyri-fəallaşdırır, əsasən "
+"fəaldır).\n"
+
+#: ../gurpmi.pm:52 ../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 - ancaq vergüllə ayrılmış verilən mediya(lar)nı işlət.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - rpm qurulumu üçün başqa root işlət.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - qurulumun düzgün edilə biləcəyini yoxla.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --media - ancaq vergüllə ayrılmış verilən mediya(lar)nı işlət.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Əmr tə'yin edilməyib"
@@ -267,6 +350,11 @@ msgstr "Qurulum bitdi"
msgid "removing %s"
msgstr "%s silinir"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "urpmi yenidən başladılır"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -415,7 +503,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Köçütrmə bacarılmadı"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "\"%s\" medyası seçili deyil"
@@ -875,6 +970,11 @@ msgstr "\"%s\" medyumu çıxardılır"
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -929,7 +1029,12 @@ msgstr "...yenidən quraşdırma bacarılmadı"
msgid "reconfiguration done"
msgstr "yenidən quraşdırma tamamlandı"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" medyası seçili deyil"
@@ -1188,13 +1293,6 @@ msgstr ""
"\n"
"istifadə qaydası:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - bu kömək ismarışını çap edər.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1223,12 +1321,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - rpm qurulumu üçün başqa root işlət.\n"
-#: ../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 - ancaq vergüllə ayrılmış verilən mediya(lar)nı işlət.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1594,12 +1686,6 @@ msgstr " --auto - seçililər arasında paketi avtomatik seç.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - qurulumun düzgün edilə biləcəyini yoxla.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - bəzi paketlər mövcud olmasa belə istəməyə zorla.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1691,30 +1777,6 @@ msgstr " (b/X) "
msgid "Removal failed"
msgstr "Çıxartma bacarılmadı"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi buraxılış %s\n"
-"Müəllif Hüququ (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"istifadə qaydası:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --media - ancaq vergüllə ayrılmış verilən mediya(lar)nı işlət.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1722,12 +1784,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - sistemi yeniləmək üçün paketləri avtomatik seç.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1840,11 +1896,6 @@ msgstr ""
" --allow-force - istifadəçiyə paketi asıllılıqları və uyğunluq\n"
" yoxlanmadan qurma sualı verməyə icazə ver.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - rpm qurulumu üçün başqa root işlət.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1929,23 +1980,6 @@ msgstr ""
" --bug - bir sonrakı verilən arqumentlə verilmiş cərgəyə\n"
" xəta raportunu yaz.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - qurmadan əvvəl rpm imzasını yoxla\n"
-" (--no-verify-rpm bunu qeyri-fəallaşdırır, əsasən "
-"fəaldır).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - qurulumun düzgün edilə biləcəyini yoxla.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2253,12 +2287,12 @@ msgstr[0] ""
msgid "Cancel"
msgstr "Ləğv et"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "urpmi yenidən başladılır"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Hazır olanda Enter düyməsinə basın..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -2989,9 +3023,6 @@ msgstr "Rəsm tapıla bilmədi"
#~ 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"
diff --git a/po/bg.po b/po/bg.po
index 1a7a5a5e..617b287c 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +107,89 @@ msgstr " Отказ"
msgid "Choose location to save file"
msgstr "Изберете място за запис на файл"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi версия %s\n"
+"Mandriva 1999-2008, всички права запазени.\n"
+"Това е свободен софтуер и може да бъде разпространяван според условиятана "
+"GNU GPL.\n"
+"\n"
+"начин на ползване:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - автоматично избира пакети за ъпгрейд на системата.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - продължи дори ако някои пакети не съществуват.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+
+#: ../gurpmi.pm:52 ../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 - обновява само източници на обновяване.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, fuzzy, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --size - отпечатва размера на тага: size."
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - проверка дали изтриването може да се извърши коректно.\n"
+
+# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr " --update - създаване на ъпдейт посредник.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Не е въведена команда"
@@ -270,6 +352,11 @@ msgstr "Инсталацията приключи"
msgid "removing %s"
msgstr "изтриване на %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, fuzzy, c-format
+msgid "restarting urpmi"
+msgstr "Стартира slurpd: "
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -421,7 +508,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Неуспешно влизане"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "източникът \"%s\" не е избран"
@@ -887,6 +981,11 @@ msgstr "премахване на източник \"%s\":"
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -946,7 +1045,12 @@ msgstr "...пренастройката неуспешна"
msgid "reconfiguration done"
msgstr "пренастройката завършена"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "източникът \"%s\" не е избран"
@@ -1205,13 +1309,6 @@ msgstr ""
"\n"
"начин на ползване:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - показва това помощно съобщение.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1242,11 +1339,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --size - отпечатва размера на тага: size."
-#: ../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 - обновява само източници на обновяване.\n"
-
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
@@ -1622,12 +1714,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - проверка дали изтриването може да се извърши коректно.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - продължи дори ако някои пакети не съществуват.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1726,31 +1812,6 @@ msgstr " (Д/н) "
msgid "Removal failed"
msgstr "Неуспешно влизане"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi версия %s\n"
-"Mandriva 1999-2008, всички права запазени.\n"
-"Това е свободен софтуер и може да бъде разпространяван според условиятана "
-"GNU GPL.\n"
-"\n"
-"начин на ползване:\n"
-
-# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --update - създаване на ъпдейт посредник.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1758,13 +1819,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - автоматично избира пакети за ъпгрейд на системата.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1870,11 +1924,6 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:110 ../urpmq:68
-#, fuzzy, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --size - отпечатва размера на тага: size."
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1947,21 +1996,6 @@ msgid ""
" next arg.\n"
msgstr ""
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - проверка дали изтриването може да се извърши коректно.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2268,12 +2302,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "Отказ"
-#: ../urpmi:665
+#: ../urpmi:635
#, fuzzy, c-format
-msgid "restarting urpmi"
-msgstr "Стартира slurpd: "
+msgid "Press Enter when mounted..."
+msgstr "Натиснете Enter,когато сте готови..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -3007,9 +3041,6 @@ msgstr "Не е намерен changelog\n"
#~ "некоректен източник \"%s\" е маркиран като сменяем, но в действителност "
#~ "не е"
-#~ msgid "Press Enter when ready..."
-#~ msgstr "Натиснете Enter,когато сте готови..."
-
#~ msgid " -c - clean headers cache directory.\n"
#~ msgstr " -c - почистване на хедър кеш директорията.\n"
diff --git a/po/bn.po b/po/bn.po
index 19172b56..a4c96204 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +120,89 @@ msgstr "বাতিল (_ত)"
msgid "Choose location to save file"
msgstr "ফাইল সংরক্ষণ করার অবস্থান বেছে নিন"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi সংস্করণ %s\n"
+"কপিরাইট (C) ১৯৯৯-২০০৬ ম্যান্ড্রিব।\n"
+"এটি মুক্ত সফ্টওয়্যার এবং GNU GPL এর নিয়মানুযায়ী হয়তো এটা পুনঃবিতরণ করা যাবে।\n"
+"\n"
+"ব্যবহার:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - সিস্টেমটি আপগ্রেড করার জন্য সয়ংক্রিয়ভাবে প্যাকেজ নির্বাচন করো।\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - প্যাকেজ না থাকলেও জোড় করে আমন্ত্রন করো।\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - ইনস্টলের আগে rpm স্বাক্ষর যাচাই করো\n"
+" (--no-verify-rpm অকার্যকর করবে, স্বাভাবিকভাবে কার্যকর).\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - rpm ইনস্টলেশনের জন্য অন্য রুট ব্যবহার করো।\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - ইনস্টলেশনটি সঠিকভাবে হবে কি-না যাচাই করো।\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - অনুরোধকৃত (অথবা আপডেটকৃত) প্যাকেজসমুহ খোঁজার জন্য শুধুমাত্র প্রদত্ত "
+"মাধ্যম ব্যবহার করো।\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "কোন নির্দেশ পাওয়া যায় নি"
@@ -281,6 +363,11 @@ msgstr "ইনস্টলেশন প্রক্রিয়া সম্পূ
msgid "removing %s"
msgstr "%s সরানো হচ্ছে"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "urpmi আবার শুরু করা হচ্ছে"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -431,7 +518,14 @@ msgstr ""
msgid "Copying failed"
msgstr "কপি করতে ব্যর্থ"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "মাধ্যম \"%s\" নির্বাচিত হয়নি"
@@ -894,6 +988,11 @@ msgstr "\"%s\" মাধ্যম সরানো হচ্ছে"
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -948,7 +1047,12 @@ msgstr "...পুনরায় কনফিগারেশন করতে ব্
msgid "reconfiguration done"
msgstr "পুনরায় কনফিগারেশন সমপন্ন"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "মাধ্যম \"%s\" নির্বাচিত হয়নি"
@@ -1206,13 +1310,6 @@ msgstr ""
"\n"
"ব্যবহার: urpmf [options] pattern-expression\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - এই সাহায্যকারী বার্তাটি ছাপাও।\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1242,11 +1339,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - rpm ইনস্টলেশনের জন্য অন্য রুট ব্যবহার করো।\n"
-#: ../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"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1607,12 +1699,6 @@ msgstr " --auto - পছন্দসমূহ থেকে সয়ংক
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - সরানোটি সঠিকভাবে সম্পন্ন করা যাবে কি-না যাচাই করো।\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - প্যাকেজ না থাকলেও জোড় করে আমন্ত্রন করো।\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1707,30 +1793,6 @@ msgstr "(y/N) "
msgid "Removal failed"
msgstr "সরাতে ব্যর্থ"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi সংস্করণ %s\n"
-"কপিরাইট (C) ১৯৯৯-২০০৬ ম্যান্ড্রিব।\n"
-"এটি মুক্ত সফ্টওয়্যার এবং GNU GPL এর নিয়মানুযায়ী হয়তো এটা পুনঃবিতরণ করা যাবে।\n"
-"\n"
-"ব্যবহার:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - অনুরোধকৃত (অথবা আপডেটকৃত) প্যাকেজসমুহ খোঁজার জন্য শুধুমাত্র প্রদত্ত "
-"মাধ্যম ব্যবহার করো।\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1738,13 +1800,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - সিস্টেমটি আপগ্রেড করার জন্য সয়ংক্রিয়ভাবে প্যাকেজ নির্বাচন করো।\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1861,11 +1916,6 @@ msgstr ""
" --allow-force - ডিপেন্ডন্সি এবং অখন্ডতা পরীক্ষা ছাড়া প্যাকেজ ইনস্টল করতে\n"
" ব্যবহারকারী কে জিজ্ঞাসার জন্য অনুমতি দাও।\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - rpm ইনস্টলেশনের জন্য অন্য রুট ব্যবহার করো।\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1948,22 +1998,6 @@ msgstr ""
" --bug - পরের আরগুমেন্টে উল্লেখিত ডিরেক্টরিতে একটি বাগ রিপোর্ট\n"
" তৈরী করো।\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - ইনস্টলের আগে rpm স্বাক্ষর যাচাই করো\n"
-" (--no-verify-rpm অকার্যকর করবে, স্বাভাবিকভাবে কার্যকর).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - ইনস্টলেশনটি সঠিকভাবে হবে কি-না যাচাই করো।\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2281,12 +2315,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "বাতিল"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "urpmi আবার শুরু করা হচ্ছে"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "প্রস্তুত হলে Enter চাপুন..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3026,9 +3060,6 @@ msgstr "changelog পাওয়া যায়নি\n"
#~ msgstr ""
#~ "\"%s\" incoherent মাধ্যম স্থানান্তরযোগ্য হিসেবে চিহ্নিত হয়েছে কিন্তু আসলে তা নয়"
-#~ msgid "Press Enter when ready..."
-#~ msgstr "প্রস্তুত হলে Enter চাপুন..."
-
#~ msgid " -c - clean headers cache directory.\n"
#~ msgstr " -c - হেডার ক্যাশ ডিরেক্টরি পরিষ্কার করো।\n"
diff --git a/po/br.po b/po/br.po
index 5d433b19..37efc6f0 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-03-03 18:06+0100\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
"Language-Team: Breton <LL@li.org>\n"
@@ -93,7 +93,85 @@ msgstr "_Nullañ"
msgid "Choose location to save file"
msgstr "Dibabit lec'hiadur da enrollañ ar restr"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi stumm %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Ur meziant frank eo an hini-mañ ha moien zo da zal'ch anezhañ hervez GNU "
+"GPL.\n"
+"\n"
+"arveriadur :\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 ""
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
+#, c-format
+msgid " --media - use only the given media, separated by comma.\n"
+msgstr ""
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "N'eus pakad dibabet ebet"
@@ -249,6 +327,11 @@ msgstr "Echu eo ar staliadur"
msgid "removing %s"
msgstr "lemel %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "oc'h adloc'hañ urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -397,7 +480,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Fazi en ur eilañ"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "n'eo ket dibret ar medium « %s »"
@@ -856,6 +946,11 @@ msgid "adding medium \"%s\""
msgstr "oc'h ouzhpennañ ar vedium « %s »"
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "n'eo ket endeo renkell ar chroot"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -910,7 +1005,12 @@ msgstr "... sac'het eo an adkefluniadur"
msgid "reconfiguration done"
msgstr "graet eo an adkefluniadur"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "Fazi en ur sevel anvioù restr : n'hell ket bet kavet an ezhomm %d"
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "bremañ eo ar medium « %s » dija"
@@ -1169,13 +1269,6 @@ msgstr ""
"\n"
"arveriadur : urpmf [dibarzhoù] sil\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr ""
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1206,11 +1299,6 @@ msgstr ""
" --urpmi-root - implij ur gwrizienn all evit stlennvon urpmi hag evit "
"staliañ pakadoù.\n"
-#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
-#, c-format
-msgid " --media - use only the given media, separated by comma.\n"
-msgstr ""
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1570,12 +1658,6 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1667,29 +1749,6 @@ msgstr " (y/N)"
msgid "Removal failed"
msgstr "Fazi en ur lemel"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi stumm %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Ur meziant frank eo an hini-mañ ha moien zo da zal'ch anezhañ hervez GNU "
-"GPL.\n"
-"\n"
-"arveriadur :\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1697,12 +1756,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1805,11 +1858,6 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1882,20 +1930,6 @@ msgid ""
" next arg.\n"
msgstr ""
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2194,12 +2228,12 @@ msgstr[0] "War-nes bezañ staliañ eo %d pakad. Mont war-raok ?"
msgid "Cancel"
msgstr "Nullañ"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "oc'h adloc'hañ urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Gwaskit « Mont » pa oc'h prest ..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2883,12 +2917,6 @@ msgstr "Changelog kavet ebet\n"
#~ 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"
-
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr ""
#~ "Fazi en ur sevel anvioù restr : n'hell ket bet skrivet ar restr (%s)"
diff --git a/po/bs.po b/po/bs.po
index a3feb255..238eb919 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +108,91 @@ msgstr "_Odustani"
msgid "Choose location to save file"
msgstr "Izaberi lokaciju za snimanje"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi verzija %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Ovo je slobodan software i može biti distribuiran pod uslovima GNU GPL-a.\n"
+"\n"
+"upotreba:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - ispiši ovu poruku.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - ne-interaktivni režim, koristi ponuđene odgovore na sva "
+"pitanja.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - automatski izaberi pakete za unaprijeđenje sistema.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - prisili pozivanje čak i ako neki paketi ne postoje.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - provjeri potpis rpm-a prije instalacije\n"
+" (--no-verify-rpm isključuje, normalno je uključeno).\n"
+
+#: ../gurpmi.pm:52 ../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 - koristi samo navedene medije, razdvojene zarezom.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - koristi drugi dir. za rpm instalaciju.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - provjeri da li se instalacija može ispravno izvršiti.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr " --searchmedia - koristi samo navedene medije za pretragu paketa.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Nije naveden paket"
@@ -267,6 +351,11 @@ msgstr "Instalacija završena"
msgid "removing %s"
msgstr "uklanjam %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "restartujem urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -417,7 +506,14 @@ msgstr "Previše argumenata\n"
msgid "Copying failed"
msgstr "Kopiranje nije uspjelo"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "medij \"%s\" nije izabran"
@@ -881,6 +977,11 @@ msgstr "uklanjam medij \"%s\""
#: ../urpm/media.pm:759
#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Direktorij okruženja %s ne postoji"
+
+#: ../urpm/media.pm:767
+#, fuzzy, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "izgleda da ovaj URL ne sadrži distrib"
@@ -936,7 +1037,12 @@ msgstr "...rekonfiguracija nije uspjela"
msgid "reconfiguration done"
msgstr "rekonfiguracija završena"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "Greška pri pravljenju names datoteke: zavisnost %d nedostaje"
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medij \"%s\" nije izabran"
@@ -1194,13 +1300,6 @@ msgstr ""
"\n"
"upotreba: urpmf [opcije] izraz\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - ispiši ovu poruku.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1232,11 +1331,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - koristi drugi dir. za rpm instalaciju.\n"
-#: ../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 - koristi samo navedene medije, razdvojene zarezom.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1600,13 +1694,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - provjeri da li se uklanjanje može ispravno izvršiti.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - prisili pozivanje čak i ako neki paketi ne postoje.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1703,28 +1790,6 @@ msgstr " (d/N) "
msgid "Removal failed"
msgstr "Uklanjanje nije uspjelo"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi verzija %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Ovo je slobodan software i može biti distribuiran pod uslovima GNU GPL-a.\n"
-"\n"
-"upotreba:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - koristi samo navedene medije za pretragu paketa.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1734,13 +1799,6 @@ msgstr ""
" --auto - ne-interaktivni režim, koristi ponuđene odgovore na sva "
"pitanja.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - automatski izaberi pakete za unaprijeđenje sistema.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1855,11 +1913,6 @@ msgstr ""
" --allow-force - dozvoli pitanje korisniku da instalira pakete bez\n"
" provjere ovisnosti i integriteta.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - koristi drugi dir. za rpm instalaciju.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1942,23 +1995,6 @@ msgstr ""
" --bug - ispiši izvještaj o bugu u direktorij naveden u\n"
" idućem argumentu.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - provjeri potpis rpm-a prije instalacije\n"
-" (--no-verify-rpm isključuje, normalno je uključeno).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - provjeri da li se instalacija može ispravno izvršiti.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2281,12 +2317,12 @@ msgstr[2] "Da nastavim sa instalacijom %d paketa? (%d MB)"
msgid "Cancel"
msgstr "Odustani"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "restartujem urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Pritisnite Enter kada budete spremni..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3037,18 +3073,12 @@ msgstr "Nije pronađen changelog\n"
#~ 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"
-#~ msgid "Error generating names file: dependency %d not found"
-#~ msgstr "Greška pri pravljenju names datoteke: zavisnost %d nedostaje"
-
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr ""
#~ "Greška pri pravljenju names datoteke: Ne mogu pisati u datoteku (%s)"
diff --git a/po/ca.po b/po/ca.po
index 42d6fa06..b009d179 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +108,96 @@ msgstr "_Cancel·la"
msgid "Choose location to save file"
msgstr "Escolliu la ubicació un desar el fitxer"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versió %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Aquest programa és lliure i es pot redistribuir sota els termes de la GPL de "
+"GNU.\n"
+"\n"
+"sintaxi:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - mostra aquest missatge d'ajuda.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - selecciona automàticament els paquets per actualitzar el "
+"sistema.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - força l'execució tot i que hi hagi paquets que no "
+"existeixen.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - verifica la signatura rpm abans de la instal·lació\n"
+" (--no-verify-rpm la deshabilita, per defecte està "
+"habilitat)\n"
+
+#: ../gurpmi.pm:52 ../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 - utilitza només les fonts donades, s'han de separar amb "
+"comes.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - usa una altre arrel per la instal·lació de rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - verifica si la instal·lació pot ser duta a terme.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - utilitza només les fonts donades per cercar "
+"paquets.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "No s'ha especificat cap paquet"
@@ -267,6 +356,11 @@ msgstr "Instal·lació finalitzada"
msgid "removing %s"
msgstr "s'està eliminant %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "s'esta reiniciant urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -417,7 +511,14 @@ msgstr ""
msgid "Copying failed"
msgstr "La còpia ha fallat"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "la font \"%s\" no ha estat seleccionada"
@@ -884,6 +985,11 @@ msgstr "s'està esborrant la font \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -939,7 +1045,12 @@ msgstr "..la reconfiguració ha fallat"
msgid "reconfiguration done"
msgstr "reconfiguració acabada"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "la font \"%s\" no ha estat seleccionada"
@@ -1198,13 +1309,6 @@ msgstr ""
"\n"
"sintaxi: urpmf [opcions] patró-expressió\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - mostra aquest missatge d'ajuda.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1235,13 +1339,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - usa una altre arrel per la instal·lació de rpm.\n"
-#: ../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 - utilitza només les fonts donades, s'han de separar amb "
-"comes.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1617,14 +1714,6 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - verifica si l'eliminació pot ser duta a terme.\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 l'execució tot i que hi hagi paquets que no "
-"existeixen.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1720,31 +1809,6 @@ msgstr " (s/N) "
msgid "Removal failed"
msgstr "L'eliminació ha fallat"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versió %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Aquest programa és lliure i es pot redistribuir sota els termes de la GPL de "
-"GNU.\n"
-"\n"
-"sintaxi:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - utilitza només les fonts donades per cercar "
-"paquets.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1752,14 +1816,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - selecciona automàticament els paquets per actualitzar el "
-"sistema.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1882,11 +1938,6 @@ msgstr ""
"sense\n"
" comprovar les dependències i la integritat.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - usa una altre arrel per la instal·lació de rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1968,23 +2019,6 @@ msgstr ""
" --bug - crea un informe d'errors en el directori\n"
" que s'indica en l'argument següent.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - verifica la signatura rpm abans de la instal·lació\n"
-" (--no-verify-rpm la deshabilita, per defecte està "
-"habilitat)\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - verifica si la instal·lació pot ser duta a terme.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2298,12 +2332,12 @@ msgstr[1] "No s'han pogut instal·lar els paquets (%s)!"
msgid "Cancel"
msgstr "Cancel·la"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "s'esta reiniciant urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Premeu Intro quan estigui fet..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3045,9 +3079,6 @@ msgstr "No s'ha trobat la llista de canvis\n"
#~ 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"
diff --git a/po/cs.po b/po/cs.po
index be2406c5..4dcb30ed 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-03-05 00:34+0100\n"
"Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -21,7 +21,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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../gurpmi:30 ../gurpmi2:65
#, c-format
@@ -110,7 +111,95 @@ msgstr "_Přerušit"
msgid "Choose location to save file"
msgstr "Vyberte, kam chcete uložit soubor"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi verze %s\n"
+"Copyright ©1999-2008 Mandriva.\n"
+"Toto je svobodný software a je volně šiřitelný dle podmínek licence GNU "
+"GPL.\n"
+"\n"
+"použití:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - vypíše tuto nápovědu.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - neinteraktivní mód, použije implicitní odpovědi k "
+"otázkám.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - automaticky vybere balíčky pro aktualizaci systému.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - spustí program i v případě, že některé balíčky chybí.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - zkontroluje před instalací podpis balíčku RPM\n"
+" (volba --no-verify-rpm toto vypne, jinak povoleno).\n"
+
+#: ../gurpmi.pm:52 ../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 - použít pouze uvedené zdroje, oddělené čárkou.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+" --root - použít pro instalaci balíčků jiný kořenový adresář.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - pouze zkontrolovat, zda lze provést instalacisprávně.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - použít pouze zadané zdroje pro vyhledávání požadovaných "
+"balíčků.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Nebyly zadány žádné balíčky"
@@ -184,12 +273,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 "Aby byly splněny závislosti, bude nainstalován následující balíček"
#: ../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 "Aby byly splněny závislosti, budou nainstalovány následující balíčky"
#: ../gurpmi2:218
@@ -267,6 +358,11 @@ msgstr "Instalace dokončena"
msgid "removing %s"
msgstr "odstraňuje se %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "restartuji urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -417,7 +513,14 @@ msgstr "Příliš mnoho parametrů\n"
msgid "Copying failed"
msgstr "Kopírování selhalo"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "zdroj \"%s\" není k dispozici"
@@ -596,7 +699,8 @@ msgstr "[přebaluje se]"
#: ../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 ""
"vytvořena transakce pro instalaci na %s (odstranění=%d, instalace=%d, "
"aktualizace=%d)"
@@ -796,7 +900,8 @@ msgstr "zkoumám soubor %s"
#: ../urpm/md5sum.pm:22
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
-msgstr "varování: kontrolní součet md5sum pro %s není k dispozici v souboru MD5SUM"
+msgstr ""
+"varování: kontrolní součet md5sum pro %s není k dispozici v souboru MD5SUM"
#: ../urpm/media.pm:187
#, c-format
@@ -883,6 +988,11 @@ msgid "adding medium \"%s\""
msgstr "přidávám zdroj \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "složka prostředí %s neexistuje"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "toto umístění zdá se neobsahuje žádnou distribuci"
@@ -937,7 +1047,12 @@ msgstr "...přenastavení selhalo"
msgid "reconfiguration done"
msgstr "přenastaveno"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "zdroj \"%s\" je aktuální"
@@ -1196,13 +1311,6 @@ msgstr ""
"\n"
"použití: urpmf [volby] vzor-výraz\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - vypíše tuto nápovědu.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1211,7 +1319,8 @@ msgstr " --version - vypíše číslo verze tohoto nástroje.\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 - použij specifické prostředí (většinou hlášení o chybě).\n"
+msgstr ""
+" --env - použij specifické prostředí (většinou hlášení o chybě).\n"
#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
#, c-format
@@ -1220,7 +1329,8 @@ msgstr " --excludemedia - nepoužít zadané zdroje, oddělené čárkami.\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 - neporovnávat vzory, použije se parametr jako prostý "
"řetězec.\n"
@@ -1234,15 +1344,12 @@ msgstr ""
" --urpmi-root - použít jiný kořenový adresář pro instalaci balíčků rpm a "
"databázi urpmi.\n"
-#: ../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 - použít pouze uvedené zdroje, oddělené čárkou.\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 - třídit zdroje podle podřetězců oddělených čárkami.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia - třídit zdroje podle podřetězců oddělených čárkami.\n"
#: ../urpm/search.pm:43 ../urpmf:43
#, c-format
@@ -1252,7 +1359,8 @@ msgstr " --use-distrib - použít zadanou cestu pro přístup ke zdroji\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 - použít daný soubor se syntézou místo databáze urpmi.\n"
+msgstr ""
+" --synthesis - použít daný soubor se syntézou místo databáze urpmi.\n"
#: ../urpm/search.pm:45 ../urpmf:45
#, c-format
@@ -1461,7 +1569,8 @@ msgstr " -m - zdroj, ve kterém byl balíček nalezen\n"
#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:94
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - společně se jménem vypíše verzi, vydání a architekturu.\n"
+msgstr ""
+" -f - společně se jménem vypíše verzi, vydání a architekturu.\n"
#: ../urpm/search.pm:197 ../urpmf:197
#, c-format
@@ -1495,8 +1604,10 @@ msgstr "urpmi bylo znovu spuštěno a seznam prioritních balíčků se nezměni
#: ../urpm/select.pm:23
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi bylo znovu spuštěno a seznam prioritních balíčků se změnil: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi bylo znovu spuštěno a seznam prioritních balíčků se změnil: %s vs %s"
#: ../urpm/select.pm:184
#, c-format
@@ -1598,17 +1709,14 @@ msgstr " --auto - automaticky vybere balíček z výběru.\n"
#: ../urpme:47
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - zkontrolovat, zda lze dokončit odstranění správně.\n"
-
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - spustí program i v případě, že některé balíčky chybí.\n"
+msgstr ""
+" --test - zkontrolovat, zda lze dokončit odstranění správně.\n"
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
-msgstr " --parallel - distribuovaný program urpmi na počítačích s přezdívkou.\n"
+msgstr ""
+" --parallel - distribuovaný program urpmi na počítačích s přezdívkou.\n"
#: ../urpme:50 ../urpmi:140
#, c-format
@@ -1618,7 +1726,8 @@ msgstr " --repackage - Před smazáním znovu zabalí soubory\n"
#: ../urpme:51
#, c-format
msgid " --root - use another root for rpm removal.\n"
-msgstr " --root - použít pro odebrání balíčků jiný kořenový adresář.\n"
+msgstr ""
+" --root - použít pro odebrání balíčků jiný kořenový adresář.\n"
#: ../urpme:53
#, c-format
@@ -1677,7 +1786,8 @@ msgstr "Kontrola odebrání následujících balíčků"
#: ../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] "Aby byly splněny závislosti, bude odebrán %d balíček"
msgstr[1] "Aby byly splněny závislosti, budou odebrány %d balíčky"
msgstr[2] "Aby byly splněny závislosti, bude odebráno %d balíčků"
@@ -1700,30 +1810,6 @@ msgstr " (a/N) "
msgid "Removal failed"
msgstr "Odebírání selhalo"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi verze %s\n"
-"Copyright ©1999-2008 Mandriva.\n"
-"Toto je svobodný software a je volně šiřitelný dle podmínek licence GNU "
-"GPL.\n"
-"\n"
-"použití:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - použít pouze zadané zdroje pro vyhledávání požadovaných "
-"balíčků.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1733,15 +1819,11 @@ msgstr ""
" --auto - neinteraktivní mód, použije implicitní odpovědi k "
"otázkám.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - automaticky vybere balíčky pro aktualizaci systému.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
-msgstr " --auto-update - provede aktualizaci zdrojů a poté aktualizaci systému.\n"
+msgstr ""
+" --auto-update - provede aktualizaci zdrojů a poté aktualizaci systému.\n"
#: ../urpmi:84
#, c-format
@@ -1819,7 +1901,8 @@ msgstr ""
#: ../urpmi:100
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
-msgstr " --clean - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
+msgstr ""
+" --clean - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
#: ../urpmi:101
#, c-format
@@ -1829,12 +1912,15 @@ msgstr " --noclean - neodstraňovat rpm balíčky z vyrovnávací paměti.
#: ../urpmi:102
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
-msgstr " --justdb - aktualizovat pouze databázi RPM, ne souborový systém.\n"
+msgstr ""
+" --justdb - aktualizovat pouze databázi RPM, ne souborový systém.\n"
#: ../urpmi:103
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - vynutit instalaci balíčků, které jsou již nainstalovány.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+" --replacepkgs - vynutit instalaci balíčků, které jsou již nainstalovány.\n"
#: ../urpmi:105
#, c-format
@@ -1854,11 +1940,6 @@ msgstr ""
" --allow-force - povolí žádost na uživatele, aby instaloval balíčky bez\n"
" kontroly závislostí a integrity.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - použít pro instalaci balíčků jiný kořenový adresář.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1943,22 +2024,6 @@ msgstr ""
" --bug - vygeneruje hlášení o chybě do adresáře \n"
" zadaného následujícím parametrem.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - zkontroluje před instalací podpis balíčku RPM\n"
-" (volba --no-verify-rpm toto vypne, jinak povoleno).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - pouze zkontrolovat, zda lze provést instalacisprávně.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2011,7 +2076,8 @@ msgstr " --nolock - nezamkne se databáze balíčků RPM.\n"
#: ../urpmi:146
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - aktualizovat pouze balíčky se shodnou architekturou.\n"
+msgstr ""
+" --strict-arch - aktualizovat pouze balíčky se shodnou architekturou.\n"
#: ../urpmi:147 ../urpmq:92
#, c-format
@@ -2041,7 +2107,8 @@ msgstr " --debug - velmi užvaněný režim.\n"
#: ../urpmi:153
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
+msgstr ""
+" názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
#: ../urpmi:181
#, c-format
@@ -2064,7 +2131,8 @@ msgstr "Při použití --install-src nelze instalovat binární balíčky RPM"
#: ../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 ""
"použijte prosím --buildrequires nebo --install-src, použije se --"
"buildrequires"
@@ -2131,7 +2199,8 @@ msgstr "%s (k instalaci)"
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
-msgstr "Aby byly splněna závislost '%s', je třeba jeden z následujících balíčků:"
+msgstr ""
+"Aby byly splněna závislost '%s', je třeba jeden z následujících balíčků:"
#: ../urpmi:458
#, c-format
@@ -2281,12 +2350,12 @@ msgstr[2] "Pokračovat v instalaci %d balíčků?"
msgid "Cancel"
msgstr "Zrušit"
-#: ../urpmi:665
+#: ../urpmi:635
#, c-format
-msgid "restarting urpmi"
-msgstr "restartuji urpmi"
+msgid "Press Enter when mounted..."
+msgstr ""
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2319,7 +2388,8 @@ msgstr ""
" removable://<cesta>\n"
"\n"
"použití: urpmi.addmedia [volby] --distrib --mirrorlist <url>\n"
-"použití: urpmi.addmedia [volby] --mirrorlist <url> <jméno> <relativní cesta>\n"
+"použití: urpmi.addmedia [volby] --mirrorlist <url> <jméno> <relativní "
+"cesta>\n"
"\n"
"příklady:\n"
"\n"
@@ -2388,7 +2458,8 @@ msgstr ""
#: ../urpmi.addmedia:72
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - spolu s --distrib se zeptá na potvrzení u každého zdroje\n"
+msgstr ""
+" --interactive - spolu s --distrib se zeptá na potvrzení u každého zdroje\n"
#: ../urpmi.addmedia:73
#, c-format
@@ -2407,7 +2478,8 @@ msgstr ""
#: ../urpmi.addmedia:76
#, c-format
msgid " --virtual - create virtual media wich are always up-to-date.\n"
-msgstr " --virtual - vytvoří virtuální zdroje, které jsou vždy aktuální.\n"
+msgstr ""
+" --virtual - vytvoří virtuální zdroje, které jsou vždy aktuální.\n"
#: ../urpmi.addmedia:77 ../urpmi.update:42
#, c-format
@@ -2522,7 +2594,8 @@ msgstr " --noclean - nečistit na kontrolním bodu sestavovací adresář\
#: ../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 - vypíše transakce od daného data/doby\n"
#: ../urpmi.recover:38
@@ -2813,8 +2886,10 @@ msgstr " --list-aliases - seznam dostupných paralelních přezdívek.\n"
#: ../urpmq:62
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - vypíše nastavení ve formě parametru pro urpmi.addmedia.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - vypíše nastavení ve formě parametru pro urpmi.addmedia.\n"
#: ../urpmq:63
#, c-format
@@ -2823,7 +2898,8 @@ msgstr " --src - další balíček je zdrojový (stejné jako -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 - všechny zdrojové balíčky před stažením (pouze uživatel "
"root).\n"
@@ -2831,7 +2907,8 @@ msgstr ""
#: ../urpmq:66
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - povolí dotazy na balíčky RPM pro jiné architektury.\n"
+msgstr ""
+" --ignorearch - povolí dotazy na balíčky RPM pro jiné architektury.\n"
#: ../urpmq:70
#, c-format
@@ -2918,7 +2995,8 @@ msgstr " -g - vypíše tag skupin společně se jménem.\n"
#: ../urpmq:96
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - tisk užitečných informací v člověkem čitelné podobě.\n"
+msgstr ""
+" -i - tisk užitečných informací v člověkem čitelné podobě.\n"
#: ../urpmq:97
#, c-format
@@ -2945,7 +3023,8 @@ msgstr " -s - další balíček je zdrojový (stejné jako --src).
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
-msgstr " -u - odebere balíček pokud je již instalována novější verze.\n"
+msgstr ""
+" -u - odebere balíček pokud je již instalována novější verze.\n"
#: ../urpmq:102
#, c-format
@@ -2960,7 +3039,8 @@ msgstr " -Y - jako -y, ale ignoruje velká a malá písmena.\n"
#: ../urpmq:104
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
+msgstr ""
+" jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
#: ../urpmq:180
#, c-format
@@ -2975,7 +3055,8 @@ msgstr "použijte -l pro seznam souborů"
#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "pro zdroj \"%s\" neexistuje xml info, pouze částečný výsledek pro balíček %s"
+msgstr ""
+"pro zdroj \"%s\" neexistuje xml info, pouze částečný výsledek pro balíček %s"
#: ../urpmq:361
#, c-format
@@ -2986,14 +3067,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 ""
"pro zdroj \"%s\" neexistuje soubor xml info, nelze vrátit žádný výsledek pro "
"balíček %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 ""
"pro zdroj \"%s\" neexistuje soubor xml info, nelze vrátit žádný výsledek pro "
"balíčky %s"
@@ -3002,4 +3085,3 @@ msgstr ""
#, c-format
msgid "No changelog found\n"
msgstr "Nebyl nalezen záznam změn\n"
-
diff --git a/po/cy.po b/po/cy.po
index 3d92e686..144509a4 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-03-11 17:54+0100\n"
"Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
"Language-Team: Cymraeg\n"
@@ -20,8 +20,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../gurpmi:30
-#: ../gurpmi2:65
+#: ../gurpmi:30 ../gurpmi2:65
#, c-format
msgid "RPM installation"
msgstr "Gosod RPM"
@@ -31,9 +30,7 @@ msgstr "Gosod RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Gwall: methu canfod ffeil %s, diddymu'r weithred"
-#: ../gurpmi:45
-#: ../gurpmi2:152
-#: ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
#, c-format
msgid "_Ok"
msgstr "_Iawn"
@@ -45,7 +42,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 ""
@@ -53,12 +51,12 @@ msgstr ""
"\n"
"%s\n"
"\n"
-"Efallai nad oeddech wedi bwriadu ei osod ar eich cyfrifiadur (byddai ei osod yn caniatáu i chi i wneud newidiadau i'r cod ffynhonnell a'i grynhoi.).\n"
+"Efallai nad oeddech wedi bwriadu ei osod ar eich cyfrifiadur (byddai ei osod "
+"yn caniatáu i chi i wneud newidiadau i'r cod ffynhonnell a'i grynhoi.).\n"
"\n"
"Beth hoffech chi ei wneud?"
-#: ../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 +96,7 @@ msgstr "_Gosod"
msgid "_Save"
msgstr "_Cadw"
-#: ../gurpmi:99
-#: ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:152
#, c-format
msgid "_Cancel"
msgstr "_Dileu"
@@ -109,7 +106,92 @@ msgstr "_Dileu"
msgid "Choose location to save file"
msgstr "Dewiswch leoliad i gadw'r ffeil"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf fersiwn %s\n"
+"Hawlfraint © 1999 - 2006 Mandriva.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU.\n"
+"\n"
+"defnydd:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - argraffu neges cymorth.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - modd anrhyngweithiol, derbyn atebion rhagosodedig i "
+"gwestiynau.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
+"bodoli.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - gwirio llofnod rpm cyn gosod\n"
+" (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n"
+
+#: ../gurpmi.pm:52 ../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 - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - defnyddio root arall ar gyfer gosod rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - gwirio os oes modd gosod yn iawn.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
+"gofynnwyd.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Heb enwi pecyn"
@@ -140,8 +222,7 @@ msgstr ""
msgid "Warning"
msgstr "Rhybudd"
-#: ../gurpmi2:114
-#: ../urpmi:626
+#: ../gurpmi2:114 ../urpmi:626
#, c-format
msgid "Ok"
msgstr "Iawn"
@@ -182,16 +263,16 @@ msgstr ""
"%s\n"
"Parhau beth bynnag?"
-#: ../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 "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
-#: ../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 "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
#: ../gurpmi2:218
@@ -206,14 +287,12 @@ msgstr[1] "(%d pecyn, %d MB)"
msgid "Package installation..."
msgstr "Gosod y pecyn..."
-#: ../gurpmi2:226
-#: ../urpm/main_loop.pm:48
+#: ../gurpmi2:226 ../urpm/main_loop.pm:48
#, c-format
msgid "unable to get source packages, aborting"
msgstr "methu estyn pecynnau ffynhonnell, atal"
-#: ../gurpmi2:240
-#: ../urpm/install.pm:81
+#: ../gurpmi2:240 ../urpm/install.pm:81
#, c-format
msgid "Preparing..."
msgstr "Paratoi..."
@@ -223,8 +302,7 @@ msgstr "Paratoi..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Gosod pecyn `%s' (%s/%s)..."
-#: ../gurpmi2:264
-#: ../urpmi:622
+#: ../gurpmi2:264 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais"
@@ -239,8 +317,7 @@ msgstr "Llwytho pecynnau i lawr ' %s'..."
msgid "_Done"
msgstr "_Gorffen"
-#: ../gurpmi2:296
-#: ../urpm/main_loop.pm:258
+#: ../gurpmi2:296 ../urpm/main_loop.pm:258
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -251,9 +328,7 @@ msgstr ""
"%s\n"
"Hoffech chi ddiweddaru eich cronfa ddata 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:"
@@ -269,12 +344,16 @@ msgstr "Popeth wedi eu gosod eisoes"
msgid "Installation finished"
msgstr "Cwblhawyd y gosod"
-#: ../gurpmi2:310
-#: ../urpme:132
+#: ../gurpmi2:310 ../urpme:132
#, c-format
msgid "removing %s"
msgstr "tynnu %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "ailgychwyn urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -309,8 +388,7 @@ msgstr " rhagosodedig yw %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - allbynnu enw llawn rpm (NVRA)\n"
-#: ../rurpmi:11
-#: ../urpmi:269
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
@@ -345,18 +423,13 @@ msgstr "enw ffeil rpm annilys [%s]"
msgid "retrieving rpm file [%s] ..."
msgstr "adfer ffeil rpm (%s)..."
-#: ../urpm.pm:232
-#: ../urpm/get_pkgs.pm:160
+#: ../urpm.pm:232 ../urpm/get_pkgs.pm:160
#, c-format
msgid "...retrieving done"
msgstr ".cwblhau adfer"
-#: ../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 "... methodd ail-lwytho: %s"
@@ -391,8 +464,7 @@ msgstr "gwall cofrestru pecynnau lleol"
msgid "This operation is forbidden while running in restricted mode"
msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
-#: ../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 "datganiad dirprwy gwallus ar y llinell orchymyn\n"
@@ -405,7 +477,9 @@ msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
#: ../urpm/args.pm:353
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "drwy ragosodiad mae urmpf yn disgwyl regexp, dylech ddefnyddio dewis \"--literal\""
+msgstr ""
+"drwy ragosodiad mae urmpf yn disgwyl regexp, dylech ddefnyddio dewis \"--"
+"literal\""
#: ../urpm/args.pm:419
#, c-format
@@ -417,8 +491,7 @@ msgstr "Nid yw cyfeiriadur chroot yn bodoli"
msgid "Can't use %s without %s"
msgstr "Methu defnyddio %s heb %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 "Methu defnyddio %s gyda %s"
@@ -428,14 +501,19 @@ msgstr "Methu defnyddio %s gyda %s"
msgid "Too many arguments\n"
msgstr "Gormod o ymresymiadau\n"
-#: ../urpm/bug_report.pm:48
-#: ../urpmi:247
+#: ../urpm/bug_report.pm:48 ../urpmi:247
#, c-format
msgid "Copying failed"
msgstr "Methodd y copïo"
-#: ../urpm/cdrom.pm:160
-#: ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "nid yw cyfrwng \"%s\" ar gael"
@@ -460,9 +538,7 @@ msgstr "Methu creu ffeil config (%s)"
msgid "medium `%s' is defined twice, aborting"
msgstr "mae cyfrwng '%s' wedi ei ddiffinio ddwy waith, cau"
-#: ../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 "methu ysgrifennu i ffeil ffurfweddiad (%s)"
@@ -600,7 +676,9 @@ msgstr "URL gwallus: [%s]"
#: ../urpm/get_pkgs.pm:149
#, c-format
msgid "sorry, you can't use --install-src to install remote .src.rpm files"
-msgstr "nid oes modd ei ddefnyddio --install-src i osod y ffeiliau pell .src.rpm files"
+msgstr ""
+"nid oes modd ei ddefnyddio --install-src i osod y ffeiliau pell .src.rpm "
+"files"
#: ../urpm/get_pkgs.pm:156
#, c-format
@@ -614,8 +692,10 @@ msgstr "[ailbecynnu]"
#: ../urpm/install.pm:154
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "crëwyd trosglwyddiad ar gyfer gosod ar %s (tynnu=%d, gosod=%d, uwchraddio=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"crëwyd trosglwyddiad ar gyfer gosod ar %s (tynnu=%d, gosod=%d, uwchraddio=%d)"
#: ../urpm/install.pm:157
#, c-format
@@ -637,8 +717,7 @@ msgstr "methu gosod pecyn %s"
msgid "removing bad rpm (%s) from %s"
msgstr "tynnu rpm gwallus (%s) o %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 "tynnu %s methodd: %s"
@@ -683,8 +762,7 @@ msgstr "Heb ddiffinio gweinydd, uri neu westeiwr coll"
msgid "No base defined"
msgstr "Sail heb ei ddiffinio"
-#: ../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 "Methu cysylltu æg uri ldap:"
@@ -719,9 +797,7 @@ msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
msgid "Do you want to continue installation ?"
msgstr "Ydych chi am barhau gosod?"
-#: ../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 "Methodd y gosod"
@@ -756,8 +832,7 @@ 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:259
-#: ../urpm/main_loop.pm:267
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
#, c-format
msgid "Error"
msgstr "Gwall"
@@ -843,8 +918,7 @@ msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", hepgor"
msgid "failed to migrate removable device, ignoring media"
msgstr "methu symud y ddyfais symudol, anwybyddu'r cyfrwng"
-#: ../urpm/media.pm:452
-#: ../urpm/media.pm:458
+#: ../urpm/media.pm:452 ../urpm/media.pm:458
#, c-format
msgid "wrote config file [%s]"
msgstr "ysgrifennu ffeil ffurfweddu (%s)"
@@ -861,8 +935,12 @@ msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
#: ../urpm/media.pm:525
#, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "--nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, --diweddaru, --use-distrib or --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"--nid oes modd defnyddio synthesis gyda --media, --excludemedia, --"
+"sortmedia, --diweddaru, --use-distrib or --parallel"
#: ../urpm/media.pm:612
#, c-format
@@ -900,6 +978,11 @@ msgid "adding medium \"%s\""
msgstr "ychwanegu cyfrwng \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "nid yw'r lleoliad i weld yn cynnwys unrhyw ddosbarthiad"
@@ -912,7 +995,8 @@ msgstr "methu didoli media.cfg"
#: ../urpm/media.pm:772
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "methu cael mynediad at gyfrwng y dosbarthiad (heb ganfod ffeil media.cfg)"
+msgstr ""
+"methu cael mynediad at gyfrwng y dosbarthiad (heb ganfod ffeil media.cfg)"
#: ../urpm/media.pm:790
#, c-format
@@ -954,7 +1038,12 @@ msgstr "...methodd ail-ffurfweddu"
msgid "reconfiguration done"
msgstr "cwblhau ail-ffurfweddu"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "Gwall wrth gynhyrchu ffeil enwau: heb ganfod dibyniaeth %d"
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
@@ -969,15 +1058,12 @@ msgstr "archwilio ffeil synthesis [%s]"
msgid "problem reading synthesis file of medium \"%s\""
msgstr "anhawster darllen synthesis ffeil cyfrwng \"%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 "copïo [%s] ar gyfer cyfrwng \"%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 "...methodd y copïo"
@@ -987,8 +1073,7 @@ msgstr "...methodd y copïo"
msgid "copying description file of \"%s\"..."
msgstr "copïo ffeil disgrifiad o \"%s\""
-#: ../urpm/media.pm:1143
-#: ../urpm/media.pm:1175
+#: ../urpm/media.pm:1143 ../urpm/media.pm:1175
#, c-format
msgid "...copying done"
msgstr "...cwblhau'r copïo"
@@ -1003,8 +1088,7 @@ msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
msgid "computing md5sum of retrieved source synthesis"
msgstr "cyfrifo md5sum o ffynhonnell synthesis adferwyd (neu 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 "methodd estyn (%s) (md5sum gwallus)"
@@ -1039,8 +1123,7 @@ msgstr "adfer ffynhonnell synthesis \"%s\"..."
msgid "found probed synthesis as %s"
msgstr "canfod synthesis holwyd fel %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 "dim ffeil synthesis file ar gyfer cyfrwng \"%s\""
@@ -1090,10 +1173,7 @@ msgstr "wedi canfod geolleoleiddio %s %.2f %.2f o gylchfa amser %s"
msgid "getting mirror list from %s"
msgstr "estyn rhestr drychai o %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"
@@ -1103,15 +1183,8 @@ msgstr "Nn"
# can hit those keys in their keyboard to reply.
# please keep the 'Yy' for compatibility reasons
#. -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"
@@ -1176,8 +1249,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"
@@ -1207,8 +1279,7 @@ msgstr "methu defnyddio dewis paralel \"%s\""
msgid "unable to access medium \"%s\"."
msgstr "methu cael mynediad at gyfrwng. \"%s\""
-#: ../urpm/removable.pm:66
-#: ../urpm/removable.pm:84
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "gosod %s"
@@ -1218,13 +1289,13 @@ msgstr "gosod %s"
msgid "unmounting %s"
msgstr "dadosod %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 ""
@@ -1234,367 +1305,291 @@ msgstr ""
"\n"
"defnydd: urpmf [dewisiadau] pattern-expression\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - argraffu neges cymorth.\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 - argraffu rhif fersiwn yr offeryn.\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 - defnyddio amgylchedd penodol (adroddiad gwall fel rheol).\n"
+msgstr ""
+" --env - defnyddio amgylchedd penodol (adroddiad gwall fel "
+"rheol).\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 - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
+msgstr ""
+" --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\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"
-msgstr " --literal, -l - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn llythrennedd.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+" --literal, -l - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
+"llythrennedd.\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 - defnyddio root arall ar gyfer gosod urpmi db ac rpm.\n"
-
-#: ../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 - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
+msgstr ""
+" --urpmi-root - defnyddio root arall ar gyfer gosod urpmi db ac "
+"rpm.\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"
-msgstr " --sortmedia - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda choma.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
+"choma.\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 - defnyddio'r llwybr yma i gael mynediad ar y cyfrwng.\n"
+msgstr ""
+" --use-distrib - defnyddio'r llwybr yma i gael mynediad ar y cyfrwng.\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 - defnyddio'r synthesis yn lle urpmi db.\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 - peidio argraffu llinellau'r un fath.\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 - defnyddio cyfrwng diweddaru'n unig.\n"
-#: ../urpm/search.pm:47
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
#, c-format
msgid " --verbose - verbose mode.\n"
msgstr " --verbose - modd llafar.\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 - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
+msgstr ""
+" -i - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\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 - cadw gwahaniaeth maint llythrennau ym mhob patrwm (rhagosodiad).\n"
+msgstr ""
+" -i - cadw gwahaniaeth maint llythrennau ym mhob patrwm "
+"(rhagosodiad).\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> - newid ymwahanydd maes (arferol i ':').\n"
-#: ../urpm/search.pm:51
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
#, c-format
msgid "Pattern expressions:\n"
msgstr "Mynegiadau patrymau:\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 - unrhyw destun wedi ei ddidoli fel regexp, onibai fod -l yn cael ei ddefnyddio.\n"
+msgstr ""
+" text - unrhyw destun wedi ei ddidoli fel regexp, onibai fod -l "
+"yn cael ei ddefnyddio.\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 - cynnwys perl cod yn union fel 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 - gweithredwr deuaidd AND.\n"
-#: ../urpm/search.pm:55
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
#, c-format
msgid " -o - binary OR operator.\n"
msgstr " -o - gweithredwr deuaidd OR.\n"
-#: ../urpm/search.pm:56
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
#, c-format
msgid " ! - unary NOT.\n"
msgstr " ! - unaidd NOT.\n"
-#: ../urpm/search.pm:57
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
#, c-format
msgid " ( ) - left and right parentheses.\n"
msgstr " ( ) - parenthesis de a chwith.\n"
-#: ../urpm/search.pm:58
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
#, c-format
msgid "List of tags:\n"
msgstr "Rhestr tagiau:\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 - pennu allbwn fformat printf-aidd\n"
-#: ../urpm/search.pm:60
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
#, c-format
msgid " example: '%%name:%%files'\n"
msgstr " esiampl: '%%enw:%%ffeil'\n"
-#: ../urpm/search.pm:61
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
#, c-format
msgid " --arch - architecture\n"
msgstr " --arch - saernïaeth\n"
-#: ../urpm/search.pm:62
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
#, c-format
msgid " --buildhost - build host\n"
msgstr " --buildhost - gwestai'r adeiladedd\n"
-#: ../urpm/search.pm:63
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
#, c-format
msgid " --buildtime - build time\n"
msgstr " --buildtime - amser adeiladu\n"
-#: ../urpm/search.pm:64
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
#, c-format
msgid " --conffiles - configuration files\n"
msgstr " --conffiles - ffeiliau ffurfweddiad\n"
-#: ../urpm/search.pm:65
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
#, c-format
msgid " --conflicts - conflict tags\n"
msgstr " --conflicts - tagiau gwrthdaro\n"
-#: ../urpm/search.pm:66
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
#, c-format
msgid " --description - package description\n"
msgstr " --description - disgrifiad pecyn\n"
-#: ../urpm/search.pm:67
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
#, c-format
msgid " --distribution - distribution\n"
msgstr " --distribution - dosbarthiad\n"
-#: ../urpm/search.pm:68
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
#, c-format
msgid " --epoch - epoch\n"
msgstr " --epoch - cyfnod\n"
-#: ../urpm/search.pm:69
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
#, c-format
msgid " --filename - filename of the package\n"
msgstr " --filename - enw ffeil y pecyn\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 - rhestr ffeiliau o fewn y pecyn\n"
-#: ../urpm/search.pm:71
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
#, c-format
msgid " --group - group\n"
msgstr " --group - grŵp\n"
-#: ../urpm/search.pm:72
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
#, c-format
msgid " --license - license\n"
msgstr " --license - trwydded\n"
-#: ../urpm/search.pm:73
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
#, c-format
msgid " --name - package name\n"
msgstr " --name - enw'r pecyn\n"
-#: ../urpm/search.pm:74
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - tagiau'r hen\n"
-#: ../urpm/search.pm:75
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
#, c-format
msgid " --packager - packager\n"
msgstr " --packager - pecynydd\n"
-#: ../urpm/search.pm:76
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - tag darparu\n"
-#: ../urpm/search.pm:77
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - tagiau angenrhaid\n"
-#: ../urpm/search.pm:78
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
#, c-format
msgid " --size - installed size\n"
msgstr " --size - maint wedi gosod\n"
-#: ../urpm/search.pm:79
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - enw rpm ffynhonnell\n"
-#: ../urpm/search.pm:80
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
#, c-format
msgid " --suggests - suggests tags\n"
msgstr " --suggests - cynnig tagiau\n"
-#: ../urpm/search.pm:81
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
#, c-format
msgid " --summary - summary\n"
msgstr " --summary - crynodeb\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 - gwerthwr\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 - y cyfrwng lle cafwyd y pecyn\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 - argraffu fersiwn a rhyddhad ac arch gydag enw.\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 "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig"
-#: ../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 "ddefnyddio amgylchedd penodol ar %s\n"
-#: ../urpm/search.pm:290
-#: ../urpmf:290
+#: ../urpm/search.pm:290 ../urpmf:290
#, c-format
msgid "no hdlist available for medium \"%s\""
msgstr "dim ffeil hdlist ar gyfer cyfrwng \"%s\""
-#: ../urpm/search.pm:297
-#: ../urpmf:297
+#: ../urpm/search.pm:297 ../urpmf:297
#, c-format
msgid "no synthesis available for medium \"%s\""
msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\""
-#: ../urpm/search.pm:304
-#: ../urpmf:306
+#: ../urpm/search.pm:304 ../urpmf:306
#, c-format
msgid "no xml-info available for medium \"%s\""
msgstr "dim xml-info ar gyfer cyfrwng \"%s\""
@@ -1606,22 +1601,22 @@ msgstr "ail gychwynnwyd urpmi, ac nid yw'r rhestr prif pecynnau wedi newid"
#: ../urpm/select.pm:23
#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "ail gychwynnwyd urpmi, ac mae'r rhestr prif pecynnau wedi newid: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"ail gychwynnwyd urpmi, ac mae'r rhestr prif pecynnau wedi newid: %s vs %s"
#: ../urpm/select.pm:184
#, c-format
msgid "No package named %s"
msgstr "Dim pecyn o'r enw %s"
-#: ../urpm/select.pm:186
-#: ../urpme:107
+#: ../urpm/select.pm:186 ../urpme:107
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Mae pecynnau canlynol yn cynnwys %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 "oherwydd %s coll"
@@ -1631,8 +1626,7 @@ msgstr "oherwydd %s coll"
msgid "due to already installed %s"
msgstr "oherwydd %s wedi ei osod eisoes"
-#: ../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 heb ei foddloni"
@@ -1692,7 +1686,8 @@ msgstr "Methu symud ffeil %s i %s"
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2008 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 ""
@@ -1712,22 +1707,13 @@ msgstr " --auto - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - gwirio os oes modd tynnu'n iawn.\n"
-#: ../urpme:48
-#: ../urpmi:104
-#: ../urpmq:65
-#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n bodoli.\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 wedi ei ddosbarthu ar draws beiriannau eraill.\n"
+msgstr ""
+" --parallel - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
-#: ../urpme:50
-#: ../urpmi:140
+#: ../urpme:50 ../urpmi:140
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Ailbecynnu'r ffeiliau cyn eu dileu\n"
@@ -1751,9 +1737,7 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
" wrth (ddad)osod chroot gyda dewis --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 - modd llafar.\n"
@@ -1778,8 +1762,7 @@ msgstr "pecynnau anhysbys"
msgid "unknown package"
msgstr "pecyn anhysbys"
-#: ../urpme:113
-#: ../urpmi:536
+#: ../urpme:113 ../urpmi:536
#, c-format
msgid "removing package %s will break your system"
msgstr "bydd tynnu pecynnau %s yn torri'r system"
@@ -1797,7 +1780,8 @@ msgstr "Ticio i ddileu'r pecynnau canlynol"
#: ../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] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
msgstr[1] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
@@ -1808,10 +1792,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Tynnu pecynnau %d?"
msgstr[1] "Tynnu pecynnau %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) "
@@ -1821,36 +1802,14 @@ msgstr " (y/N) "
msgid "Removal failed"
msgstr "Methodd y tynnu"
-#: ../urpmi:69
+#: ../urpmi:81
#, c-format
msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
-"\n"
-"usage:\n"
+" --auto - non-interactive mode, assume default answers to "
+"questions.\n"
msgstr ""
-"urpmf fersiwn %s\n"
-"Hawlfraint © 1999 - 2006 Mandriva.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU.\n"
-"\n"
-"defnydd:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau gofynnwyd.\n"
-
-#: ../urpmi:81
-#, c-format
-msgid " --auto - non-interactive mode, assume default answers to questions.\n"
-msgstr " --auto - modd anrhyngweithiol, derbyn atebion rhagosodedig i gwestiynau.\n"
-
-#: ../urpmi:82
-#: ../urpmq:52
-#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
+" --auto - modd anrhyngweithiol, derbyn atebion rhagosodedig i "
+"gwestiynau.\n"
#: ../urpmi:83
#, c-format
@@ -1867,24 +1826,25 @@ msgstr " --no-md5sum - analluogi gwirio ffeil MD5SUM.\n"
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - gorfodi diweddaru allwedd 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 - peidio awto ddewis pecynnau \"suggested\" .\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 - peidio gofyn i ddadosod pecyn, atal gosod.\n"
#: ../urpmi:88
#, c-format
msgid " --no-install - don't install packages (only download)\n"
-msgstr " --no-install - peidio gosod y pecynnau (dim ond eu llwytho i lawr)\n"
+msgstr ""
+" --no-install - peidio gosod y pecynnau (dim ond eu llwytho i lawr)\n"
-#: ../urpmi:89
-#: ../urpmq:55
+#: ../urpmi:89 ../urpmq:55
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1900,7 +1860,8 @@ msgid ""
" are going to be installed or upgraded,\n"
" default is %d.\n"
msgstr ""
-" --split-level - hollti'n ddarnau llai os yw mwy na'r pecynnau hyn yn cael\n"
+" --split-level - hollti'n ddarnau llai os yw mwy na'r pecynnau hyn yn "
+"cael\n"
" eu gosod neu eu uwchraddio\n"
" rhagosodiad yw %d.\n"
@@ -1922,7 +1883,8 @@ msgstr " --buildrequires - gosod buildrequires y pecynnau\n"
#: ../urpmi:99
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
-msgstr " --install-src - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
+msgstr ""
+" --install-src - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
#: ../urpmi:100
#, c-format
@@ -1941,7 +1903,8 @@ msgstr " --justdb - diweddaru'n unig db yr rpm, nid y system ffeilio.\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 - gorfodi gosod pecynnau sydd wedi eu gosod eisoes.\n"
#: ../urpmi:105
@@ -1962,12 +1925,6 @@ msgstr ""
" --allow-force - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
" wirio dibyniaethau na'u cyfanrwydd.\n"
-#: ../urpmi:110
-#: ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - defnyddio root arall ar gyfer gosod rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -2011,9 +1968,7 @@ msgstr " --cprozilla-options - dewis ychwanegol wrth ddefnyddio prozilla\n"
msgid " --aria2-options - additional options to pass to aria2\n"
msgstr " --aria2-options -dewis ychwanegol i'w estyn i 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 - cyfyngu cyflymder y llwytho i lawr.\n"
@@ -2027,10 +1982,7 @@ msgstr ""
" --verify-rpm - gwirio llofnod rpm cyn gosod\n"
" (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\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"
@@ -2039,10 +1991,7 @@ msgstr ""
" --proxy - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
" rhagosodiad yw 1080 (fformat yw <proxyhost[: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"
@@ -2060,20 +2009,6 @@ msgstr ""
" --bug - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
" yr arg. nesaf\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - gwirio llofnod rpm cyn gosod\n"
-" (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid " --test - only verify if the installation can be achieved correctly.\n"
-msgstr " --test - gwirio os oes modd gosod yn iawn.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2115,7 +2050,8 @@ msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
msgstr ""
-" --more-choices - pan fydd nifer o becynnau wedi eu canfod, cynnig mwy o ddewis\n"
+" --more-choices - pan fydd nifer o becynnau wedi eu canfod, cynnig mwy o "
+"ddewis\n"
" na'r rhagosodiad.\n"
#: ../urpmi:145
@@ -2126,10 +2062,10 @@ msgstr " --nolock - peidio cloi db rpm.\n"
#: ../urpmi:146
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
+msgstr ""
+" --strict-arch - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
-#: ../urpmi:147
-#: ../urpmq:92
+#: ../urpmi:147 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - dewis pob cydweddiad ar y llinell gorchymyn.\n"
@@ -2157,7 +2093,9 @@ msgstr " - --debug - modd llafar iawn.\n"
#: ../urpmi:153
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael eu gosod.\n"
+msgstr ""
+" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
+"eu gosod.\n"
#: ../urpmi:181
#, c-format
@@ -2170,7 +2108,8 @@ msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
msgstr ""
-"Gwall: I gynhyrchu adroddiad gwall, nodwch yr ymresymiad llinell orchymyn arferol\n"
+"Gwall: I gynhyrchu adroddiad gwall, nodwch yr ymresymiad llinell orchymyn "
+"arferol\n"
"ynghyd a --bug.\n"
#: ../urpmi:215
@@ -2180,13 +2119,19 @@ msgstr "Methu gosod ffeiliau deuaidd rpm wrth ddefnyddio --install-src"
#: ../urpmi:221
#, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "defnyddiwch --buildrequires neu --install-src, yn rhagosod i --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"defnyddiwch --buildrequires neu --install-src, yn rhagosod i --buildrequires"
#: ../urpmi:241
#, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am adroddiad gwall neu ei ddileu."
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
+"adroddiad gwall neu ei ddileu."
#: ../urpmi:242
#, c-format
@@ -2238,7 +2183,9 @@ msgstr "%s (gosod)"
#: ../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 "I fodloni '%s' dibyniaeth, bydd angen un o'r pecynnau canlynol:"
#: ../urpmi:458
@@ -2268,8 +2215,7 @@ msgstr ""
"sy'n hyn na'r rhai sydd wedi eu gosod:\n"
"%s"
-#: ../urpmi:508
-#: ../urpmi:524
+#: ../urpmi:508 ../urpmi:524
#, c-format
msgid ""
"\n"
@@ -2278,10 +2224,7 @@ msgstr ""
"\n"
"Parhau i osod beth bynnag?"
-#: ../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) "
@@ -2352,10 +2295,12 @@ msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
#: ../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 ""
-"Rhaid galw urpmi yn gyntaf gyda --buildrequires er mwyn gosod y dibyniaethau canlynol:\n"
+"Rhaid galw urpmi yn gyntaf gyda --buildrequires er mwyn gosod y dibyniaethau "
+"canlynol:\n"
"%s\n"
#: ../urpmi:595
@@ -2390,12 +2335,12 @@ msgstr[1] "Parhau gyda gosod %d pecyn?"
msgid "Cancel"
msgstr "Dileu"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "ailgychwyn urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Pwyso Enter pan yn barod..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2438,23 +2383,17 @@ msgstr ""
"\n"
"a [options] o\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 - defnyddio wget i estyn ffeiliau pell.\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 - defnyddio curl i estyn ffeiliau pell.\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 - defnyddio prozilla i estyn ffeiliau pell.\n"
@@ -2468,10 +2407,13 @@ msgstr " --update - defnyddio cyfrwng diweddaru.\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 - defnyddio'r polisi penodol o lwytho ffeiliau gwybodaeth xml\n"
-" un o: byth, ar alw, diweddaru'n unig, bob tro. cf urpmi.cfg(5)\n"
+" --xml-info - defnyddio'r polisi penodol o lwytho ffeiliau gwybodaeth "
+"xml\n"
+" un o: byth, ar alw, diweddaru'n unig, bob tro. cf urpmi."
+"cfg(5)\n"
#: ../urpmi.addmedia:66
#, c-format
@@ -2500,7 +2442,8 @@ msgstr ""
#: ../urpmi.addmedia:72
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --rhyngweithiol - gyda --distrib, gofyn cadarnhad gyda phob cyfrwng\n"
+msgstr ""
+" --rhyngweithiol - gyda --distrib, gofyn cadarnhad gyda phob cyfrwng\n"
#: ../urpmi.addmedia:73
#, c-format
@@ -2513,7 +2456,8 @@ msgid ""
" --from - use specified url for list of mirrors, the default is\n"
" %s\n"
msgstr ""
-" --from - defnyddio url pennwyd ar gyfer rhestr drychau, y rhagosodedig yw\n"
+" --from - defnyddio url pennwyd ar gyfer rhestr drychau, y "
+"rhagosodedig yw\n"
" %s\n"
#: ../urpmi.addmedia:76
@@ -2521,8 +2465,7 @@ msgstr ""
msgid " --virtual - create virtual media wich are always up-to-date.\n"
msgstr " --virtual - creu cyfrwng rhithiol sydd wedi ei ddiweddaru,\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 - analluogi gwirio ffeil MD5SUM.\n"
@@ -2535,18 +2478,15 @@ msgstr " --nopubkey - peidio mewnforio pubkey y cyfrwng ychwanegwyd\n"
#: ../urpmi.addmedia:79
#, c-format
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"
+msgstr ""
+" --raw - ychwanegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n"
-#: ../urpmi.addmedia:80
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:51
+#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - modd distaw.\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 " --verbose - modd llafar.\n"
@@ -2564,7 +2504,8 @@ msgstr "dim angen ymresymiad ar gyfer --distrib --mirrorlist <url>"
#: ../urpmi.addmedia:118
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "gwallus <url> (ar gyfer cyfeiriadur lleol, rhaid i'r llwybr fod yn absoliwt)"
+msgstr ""
+"gwallus <url> (ar gyfer cyfeiriadur lleol, rhaid i'r llwybr fod yn absoliwt)"
#: ../urpmi.addmedia:122
#, c-format
@@ -2615,7 +2556,8 @@ msgstr "methu ychwanegu cyfrwng"
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 ""
@@ -2637,8 +2579,10 @@ msgstr " --noclean - peidio glanhau rpm ar checkpoint\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
-msgstr " --list - rhestri trafodion ers darparu ymresymiad dyddiad hyd\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
+msgstr ""
+" --list - rhestri trafodion ers darparu ymresymiad dyddiad hyd\n"
#: ../urpmi.recover:38
#, c-format
@@ -2726,8 +2670,7 @@ msgstr "Dim trafodion ers %s\n"
msgid "You must be superuser to do this"
msgstr "Rhaid bod yn uwch-ddefnyddiwr i wneud hyn"
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
#, c-format
msgid "Writing rpm macros file [%s]...\n"
msgstr "Ysgrifennu ffeil macros rpm [%s]...\n"
@@ -2807,17 +2750,20 @@ msgstr " --force-key - gorfodi diweddaru allwedd gpg.\n"
#: ../urpmi.update:44
#, c-format
msgid " --ignore - don't update, mark the media as ignored.\n"
-msgstr " --norebuild - peidio diweddaru, marcio'r cyfrwng wedi ei anwybyddu.\n"
+msgstr ""
+" --norebuild - peidio diweddaru, marcio'r cyfrwng wedi ei anwybyddu.\n"
#: ../urpmi.update:45
#, c-format
msgid " --no-ignore - don't update, mark the media as enabled.\n"
-msgstr " --no-ignore - peidiwch diweddaru, marciwch y cyfrwng wedi ei alluogi.\n"
+msgstr ""
+" --no-ignore - peidiwch diweddaru, marciwch y cyfrwng wedi ei alluogi.\n"
#: ../urpmi.update:47
#, c-format
msgid " --probe-rpms - do not use synthesis, use rpm files directly\n"
-msgstr " --probe-rpms - peidio defnyddio synthesis, defnyddiwch ffeiliau rpm\n"
+msgstr ""
+" --probe-rpms - peidio defnyddio synthesis, defnyddiwch ffeiliau rpm\n"
#: ../urpmi.update:48
#, c-format
@@ -2873,7 +2819,8 @@ msgstr "galluogi cyfrwng %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 ""
@@ -2885,8 +2832,12 @@ msgstr ""
#: ../urpmq:48
#, c-format
-msgid " --searchmedia - use only the given media to search requested (or updated) packages.\n"
-msgstr " --searchmedia - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau gofynnwyd (neu diweddarwyd).\n"
+msgid ""
+" --searchmedia - use only the given media to search requested (or updated) "
+"packages.\n"
+msgstr ""
+" --searchmedia - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
+"gofynnwyd (neu diweddarwyd).\n"
#: ../urpmq:54
#, c-format
@@ -2911,7 +2862,8 @@ msgstr " --list-url - rhestri'r holl gyfrwng ar gael.\n"
#: ../urpmq:60
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n"
+msgstr ""
+" --list-nodes - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n"
#: ../urpmq:61
#, c-format
@@ -2920,23 +2872,30 @@ msgstr " --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n"
#: ../urpmq:62
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
-msgstr " --dump-config - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi.addmedia.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+" --dump-config - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi."
+"addmedia.\n"
#: ../urpmq:63
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
+msgstr ""
+" --src - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
#: ../urpmq:64
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
-msgstr " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
+msgstr ""
+" --sources - give all source packages before downloading (root only).\n"
#: ../urpmq:66
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - caniatáu ymholi rpmau ar gyfer saernïaeth annhebyg.\n"
+msgstr ""
+" --ignorearch - caniatáu ymholi rpmau ar gyfer saernïaeth annhebyg.\n"
#: ../urpmq:70
#, c-format
@@ -3023,7 +2982,9 @@ msgstr " -g - argraffu grwpiau gydag enw hefyd.\n"
#: ../urpmq:96
#, c-format
msgid " -i - print useful information in human readable form.\n"
-msgstr " -i - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy i bobl.\n"
+msgstr ""
+" -i - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
+"i bobl.\n"
#: ../urpmq:97
#, c-format
@@ -3043,12 +3004,17 @@ msgstr " -r - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
#: ../urpmq:100
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " --s - pecyn nesaf yn becyn ffynhonnell (yr un peth â --src).\n"
+msgstr ""
+" --s - pecyn nesaf yn becyn ffynhonnell (yr un peth â --src).\n"
#: ../urpmq:101
#, c-format
-msgid " -u - remove package if a more recent version is already installed.\n"
-msgstr " -u - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei osod.\n"
+msgid ""
+" -u - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+" -u - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
+"osod.\n"
#: ../urpmq:102
#, c-format
@@ -3058,12 +3024,16 @@ msgstr " -y - gosod chwilio fuzzy (fel --fuzzy).\n"
#: ../urpmq:103
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -Y - fel -y, ond yn gorfodi cydweddu diffyg cydweddiad maint llythrennau.\n"
+msgstr ""
+" -Y - fel -y, ond yn gorfodi cydweddu diffyg cydweddiad maint "
+"llythrennau.\n"
#: ../urpmq:104
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael eu holi.\n"
+msgstr ""
+" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
+"eu holi.\n"
#: ../urpmq:180
#, c-format
@@ -3078,22 +3048,32 @@ msgstr "defnyddiwch -l i restru'r ffeiliau"
#: ../urpmq:363
#, c-format
msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "dim xml info ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer pecyn %s"
+msgstr ""
+"dim xml info ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer "
+"pecyn %s"
#: ../urpmq:361
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "dimxml info ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer pecynnau %s"
+msgstr ""
+"dimxml info ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer "
+"pecynnau %s"
#: ../urpmq:364
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "dim xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer pecyn %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"dim xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
+"pecyn %s"
#: ../urpmq:365
#, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "dim xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer pecynnau %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"dim xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
+"pecynnau %s"
#: ../urpmq:429
#, c-format
@@ -3102,19 +3082,26 @@ 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 "
@@ -3122,122 +3109,161 @@ msgstr "Heb ganfod changelog\n"
#~ 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"
-#~ msgid "Error generating names file: dependency %d not found"
-#~ msgstr "Gwall wrth gynhyrchu ffeil enwau: heb ganfod dibyniaeth %d"
+
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr "Gwall wrth gynhyrchu ffeil enwau: Methu ysgrifennu ffeil (%s)"
#, fuzzy
#~ msgid "unable to parse synthesis file of \"%s\""
#~ msgstr "methu didoli ffeil hdlist \"%s\""
+
#~ msgid "found %d rpm headers in cache, removing %d obsolete headers"
#~ msgstr "wedi canfod %d pennawd rpm yn yr ystorfa, tynnu %d hen bennawd"
+
#~ msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
#~ msgstr "cyfrifo md5sum ffynhonnell presennol hdlist (neu synthesis) [%s]"
+
#~ msgid ""
#~ "virtual medium \"%s\" should not have defined hdlist or list file, medium "
#~ "ignored"
#~ msgstr ""
#~ "dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y "
#~ "cyfrwng"
+
#~ msgid "invalid hdlist name"
#~ msgstr "enw hdlist annilys"
+
#~ msgid "unable to find list file for \"%s\", medium ignored"
#~ msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
+
#~ msgid "\"synthesis\" should not be set (medium \"%s\")"
#~ msgstr "nid ddylai \"synthesis\" gael ei osod (canolig \"%s\")"
+
#~ msgid "\"synthesis\" should be set (medium \"%s\")"
#~ msgstr "\"synthesis\" i'w osod (canolig \"%s\")"
+
#~ msgid "unable to access list file of \"%s\""
#~ msgstr "methu cael mynediad ffeil rhestr \"%s\""
+
#~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
#~ msgstr ""
#~ "cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r "
#~ "cyfrwng"
+
#~ msgid "medium \"%s\" trying to use an already used list, medium ignored"
#~ msgstr ""
#~ "cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r "
#~ "cyfrwng"
+
#~ msgid "wrote %s"
#~ msgstr "ysgrifennodd %s"
+
#~ msgid ""
#~ "Note: no hdlist for medium \"%s\", unable to return any result for it"
#~ msgstr ""
#~ "Sylw: dim hdlist ar gyfer cyfrwng \"%s\", methu dychwelyd canlyniadau ar "
#~ "ei gyfer"
+
#~ msgid "performing second pass to compute dependencies\n"
#~ msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
+
#~ msgid "building hdlist [%s]"
#~ msgstr "adeiladu hdlist [%s]"
+
#~ msgid ""
#~ "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
#~ "corrupted."
#~ msgstr ""
#~ "Methu adeiladu ffeil synthesis ar gyfer cyfrwng \"%s\". Efallai bod eich "
#~ "ffeil hdlist yn llygredig."
+
#~ msgid "problem reading hdlist or synthesis file of medium \"%s\""
#~ msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
+
#~ msgid "computing md5sum of copied source hdlist (or synthesis)"
#~ msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
+
#~ msgid "...retrieving failed: md5sum mismatch"
#~ msgstr "... methodd ail-lwytho: anghysondeb md5sum"
+
#~ msgid "no rpm files found from [%s]"
#~ msgstr "heb ganfod ffeiliau rpm o [%s]"
+
#~ msgid "unable to read rpm files from [%s]: %s"
#~ msgstr "methu darllen ffeiliau rpm o (%s): %s"
+
#~ msgid "no rpms read"
#~ msgstr "heb ddarllen rpmau"
+
#~ msgid "reading headers from medium \"%s\""
#~ msgstr "darllen pennawd o'r cyfrwng \"%s\""
+
#~ msgid " --probe-synthesis - use synthesis file.\n"
#~ msgstr " --probe-synthesis - defnyddio ffeil synthesis.\n"
+
#~ msgid " --probe-hdlist - use hdlist file.\n"
#~ msgstr " --probe-hdlist - defnyddio ffeil hdlist.\n"
+
#~ msgid ""
#~ "Note: since no media searched uses hdlists, urpmf was unable to return "
#~ "any result\n"
#~ msgstr ""
#~ "Sylw: gan nad oedd unrhyw gyfrwng chwiliwyd yn defnyddio hdlists, methodd "
#~ "urpmf â chynnig canlyniad\n"
+
#~ msgid "You may want to use --name to search for package names.\n"
#~ msgstr "Efallai yr hoffech ddefnyddio --name i chwilio am enwau pecynnau.\n"
+
#~ msgid " --src, -s - next package is a source package.\n"
#~ msgstr " --src, -s - pecyn nesaf yn becyn ffynhonnell.\n"
+
#~ msgid " --probe-hdlist - use hdlist file.\n"
#~ msgstr " --probe-hdlist - defnyddio ffeil hdlist.\n"
+
#~ msgid "unable to update medium \"%s\"\n"
#~ msgstr "methu diweddaru cyfrwng \"%s\"\n"
+
#~ msgid "unable to create medium \"%s\"\n"
#~ msgstr "methu creu cyfrwng \"%s\"\n"
+
#~ msgid "there are multiple packages with the same rpm filename \"%s\""
#~ msgstr "mae yna becynnau niferus gyda'r un enw ffeil rpm \"%s\""
+
#~ msgid "unable to correctly parse [%s] on value \"%s\""
#~ msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
+
#~ msgid "(retry as root?)"
#~ msgstr "(ceisio eto fel root)"
+
#~ msgid ""
#~ "medium \"%s\" uses an invalid list file:\n"
#~ " mirror is probably not up-to-date, trying to use alternate method"
#~ msgstr ""
#~ "cyfrwng \"%s\" yn defnyddio rhestr ffeiliau annilys:\n"
#~ " nid yw'r drych yn un diweddar, ceisiwch ddull arall"
+
#~ msgid "medium \"%s\" does not define any location for rpm files"
#~ msgstr ""
#~ "nid yw cyfrwng \"%s\" yn diffinio unrhyw leoliad ar gyfer ffeiliau rpm"
+
#~ msgid "unrequested"
#~ msgstr "diofyn"
+
#~ msgid " (%d MB)"
#~ msgstr " (%d MB)"
+
#~ msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
#~ msgstr "ychwanegu pecyn %s (id=%d, eid=%d, update=%d, file=%s)"
+
#~ msgid ""
#~ "The following packages have bad signatures:\n"
#~ "%s\n"
@@ -3248,27 +3274,34 @@ msgstr "Heb ganfod changelog\n"
#~ "%s\n"
#~ "\n"
#~ "Hoffech chi barhau gyda'r gosod?"
+
#~ msgid "You need to be root to use --use-distrib"
#~ msgstr "Rhaid i chi fod yn wraidd i ddefnyddio --use-distrib"
+
#~ msgid "unable to remove package %s"
#~ msgstr "methu tynnu pecyn %s"
+
#~ msgid "No filelist found\n"
#~ msgstr "Heb ganfod filelist\n"
+
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
#~ msgstr ""
#~ "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu (%d MB)"
+
#~ msgid "Proceed with the installation of the %d package? (%d MB)"
#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
#~ msgstr[0] "Parhau gyda gosod %d pecyn? (%d MB)"
#~ msgstr[1] "Parhau gyda gosod %d pecyn? (%d MB)"
+
#~ msgid "(%d packages, %d MB)"
#~ msgstr "(%d pecyn, %d MB)"
+
#~ msgid ""
#~ " -P - do not search in provides to find package (default).\n"
#~ msgstr ""
#~ " -P - peidio chwilio yn provides i ganfod pecyn "
#~ "(rhagosodedig).\n"
+
#~ msgid " -R - reverse search to what requires package.\n"
#~ msgstr " -R - chwilio nôl i'r hyn sydd angen ar becyn.\n"
-
diff --git a/po/da.po b/po/da.po
index 1545fda3..3e74bc4b 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-03-03 20:14+0100\n"
"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
"Language-Team: dansk <dansk@dansk-gruppen.dk>\n"
@@ -116,7 +116,93 @@ msgstr "_Annullér"
msgid "Choose location to save file"
msgstr "Vælg sted at gemme filen"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\n"
+"Ophavsret © 1999-2008 Mandriva.\n"
+"Dette er frit programmel og kan redistribueres under vilkårene for GNU GPL.\n"
+"\n"
+"brug:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - udskriv denne hjælpebesked.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - ikke-interaktiv tilstand, antag standardsvar på "
+"spørgsmål.\n"
+
+#: ../gurpmi.pm:48 ../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"
+
+#: ../gurpmi.pm:49 ../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"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - kontrollér rpm-signatur før installation.\n"
+" (--no-verify-rpm deaktiverer det, standard er "
+"aktiveret).\n"
+
+#: ../gurpmi.pm:52 ../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 - brug kun de opgivne medier, adskilt med komma.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - brug en anden root for rpm-installation.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - afprøv kun om installationen kan udføres korrekt.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+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"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Ingen pakker angivet"
@@ -190,13 +276,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
@@ -272,6 +362,11 @@ msgstr "Installationen færdig"
msgid "removing %s"
msgstr "fjerner %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "genstarter urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -422,7 +517,14 @@ msgstr "For mange argumenter\n"
msgid "Copying failed"
msgstr "Kopiering mislykkedes"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "medie \"%s\" er ikke tilgængeligt"
@@ -601,7 +703,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)"
@@ -887,6 +990,11 @@ msgid "adding medium \"%s\""
msgstr "tilføjer medie \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Miljøkatalog %s eksisterer ikke"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "denne adresse ser ikke ud til at indeholde nogen distribution"
@@ -941,7 +1049,12 @@ msgstr "...omkonfigurering mislykkedes"
msgid "reconfiguration done"
msgstr "omkonfigurering færdig"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medie \"%s\" er tidssvarende"
@@ -1199,13 +1312,6 @@ msgstr ""
"\n"
"brug: urpmf [tilvalg] mønster-udtryk\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - udskriv denne hjælpebesked.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1223,7 +1329,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"
@@ -1233,17 +1340,15 @@ 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"
-
-#: ../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 - brug kun de opgivne medier, adskilt med komma.\n"
+msgstr ""
+" --urpmi-root - Brug anden rod for urpmi-database og rpm-installering.\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
@@ -1502,7 +1607,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"
@@ -1608,11 +1714,6 @@ msgstr " --auto - vælg automatisk en pakke ved valg.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
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"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1685,9 +1786,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
@@ -1706,29 +1810,6 @@ msgstr " (j/N) "
msgid "Removal failed"
msgstr "Fjernelse mislykkedes"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi version %s\n"
-"Ophavsret © 1999-2008 Mandriva.\n"
-"Dette er frit programmel og kan redistribueres under vilkårene for GNU GPL.\n"
-"\n"
-"brug:\n"
-
-#: ../urpmi:78
-#, c-format
-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"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1738,11 +1819,6 @@ msgstr ""
" --auto - ikke-interaktiv tilstand, antag standardsvar på "
"spørgsmål.\n"
-#: ../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"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1834,7 +1910,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"
@@ -1858,11 +1935,6 @@ msgstr ""
" --allow-force - tillad at spørge bruger om installering af pakker\n"
" uden kontrol af afhængigheder og integritet.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - brug en anden root for rpm-installation.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1947,23 +2019,6 @@ msgstr ""
" --bug - udskriv en fejlrapport i et katalog angivet i næste\n"
" argument.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - kontrollér rpm-signatur før installation.\n"
-" (--no-verify-rpm deaktiverer det, standard er "
-"aktiveret).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - afprøv kun om installationen kan udføres korrekt.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -1977,7 +2032,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
@@ -2048,7 +2104,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
@@ -2071,7 +2128,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
@@ -2287,12 +2345,12 @@ msgstr[1] "Fortsæt installationen med de %d pakker?"
msgid "Cancel"
msgstr "Annullér"
-#: ../urpmi:665
+#: ../urpmi:635
#, c-format
-msgid "restarting urpmi"
-msgstr "genstarter urpmi"
+msgid "Press Enter when mounted..."
+msgstr ""
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2348,7 +2406,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
@@ -2387,12 +2446,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
@@ -2521,12 +2582,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
@@ -2812,7 +2876,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"
@@ -2824,7 +2889,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
@@ -2986,16 +3052,18 @@ 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
#, c-format
msgid "No changelog found\n"
msgstr "Ingen ændringslog fundet\n"
-
diff --git a/po/de.po b/po/de.po
index 4de174ed..36dd7ad9 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +106,98 @@ msgstr "_Abbrechen"
msgid "Choose location to save file"
msgstr "Wähle Speicherort aus"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
+"vertrieben werden.\n"
+"\n"
+"Verwendung:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - Diese Hilfe-Botschaft anzeigen.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - nicht-interaktiver Modus, vorgegebene Antworten werden "
+"bei Fragen angenommen.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - Automatische Paketauswahl zur Aktualisierung des "
+"Systems.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - Erzwinge Aufruf, sogar wenn einige Pakete nicht "
+"existieren.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - Überprüfung der RPM-Signatur vor der Installation.\n"
+" (--no-verify-rpm deaktiviert das Verhalten,\n"
+" Voreingestellt: Kontrolle der Signaturen).\n"
+
+#: ../gurpmi.pm:52 ../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 - Benutze nur durch Kommata getrennte Medienliste.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+" --root - benutze anderes Wurzelverzeichnis zur RPM Installation.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - Versuch, ob die Installation korrekt verlaufen wird.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - verwende nur die gegebenen Medien um nach der "
+"angeforderten Paketen zu suchen\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Keine Pakete angegeben"
@@ -266,6 +357,11 @@ msgstr "Installation beendet"
msgid "removing %s"
msgstr "Entferne %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "starte urpmi neu"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -416,7 +512,14 @@ msgstr "zu viele Argumente\n"
msgid "Copying failed"
msgstr "Kopieren fehlgeschlagen"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "Das Medium \"%s\" ist nicht verfügbar"
@@ -884,6 +987,11 @@ msgid "adding medium \"%s\""
msgstr "hinzufügen des Mediums \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Das angegebene Verzeichnis %s existiert nicht"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "Diese Ort enthält keine Distribution"
@@ -940,7 +1048,12 @@ msgstr "...Rekonfiguration scheiterte"
msgid "reconfiguration done"
msgstr "Rekonfiguration durchgeführt"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "Fehler beim Erstellen der Namens-Datei: Abhängigkeit %d nicht gefunden"
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "Medium \"%s\" ist auf dem aktuellen Stand"
@@ -1199,13 +1312,6 @@ msgstr ""
"\n"
"Verwendung: urpmf [Optionen] Muster-Ausdruck\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - Diese Hilfe-Botschaft anzeigen.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1241,11 +1347,6 @@ msgstr ""
" --urpmi-root - benutze anderes Wurzelverzeichnis für urpmi db & RPM "
"Installation.\n"
-#: ../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 - Benutze nur durch Kommata getrennte Medienliste.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1619,14 +1720,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - verifiziere, ob die Entfernung korrekt verlaufen wird.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - Erzwinge Aufruf, sogar wenn einige Pakete nicht "
-"existieren.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1725,31 +1818,6 @@ msgstr " (j/N) "
msgid "Removal failed"
msgstr "Entfernen schlug fehl"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
-"vertrieben werden.\n"
-"\n"
-"Verwendung:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - verwende nur die gegebenen Medien um nach der "
-"angeforderten Paketen zu suchen\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1759,14 +1827,6 @@ msgstr ""
" --auto - nicht-interaktiver Modus, vorgegebene Antworten werden "
"bei Fragen angenommen.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - Automatische Paketauswahl zur Aktualisierung des "
-"Systems.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1883,12 +1943,6 @@ msgstr ""
" --allow-force - Erlaube Anwenderbefragung zur Paketinstallation\n"
" ohne Abhängigkeits- und Integritätskontrolle.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-" --root - benutze anderes Wurzelverzeichnis zur RPM Installation.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1980,24 +2034,6 @@ msgstr ""
" --bug - Erstellen eines Fehlerberichts im durch das nächste\n"
" Argument angegebenen Ordner.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - Überprüfung der RPM-Signatur vor der Installation.\n"
-" (--no-verify-rpm deaktiviert das Verhalten,\n"
-" Voreingestellt: Kontrolle der Signaturen).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - Versuch, ob die Installation korrekt verlaufen wird.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2338,12 +2374,12 @@ msgstr[1] "Fortfahren mit der Installation der %d Pakete?"
msgid "Cancel"
msgstr "Abbruch"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "starte urpmi neu"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Betätigen Sie die Eingabetaste, sobald Sie soweit sind..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3126,19 +3162,12 @@ msgstr "Kein Changelog gefunden\n"
#~ 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"
-#~ msgid "Error generating names file: dependency %d not found"
-#~ msgstr ""
-#~ "Fehler beim Erstellen der Namens-Datei: Abhängigkeit %d nicht gefunden"
-
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr ""
#~ "Fehler beim Erstellen der Namens-Datei: Kann Datei (%s) nicht schreiben"
diff --git a/po/el.po b/po/el.po
index a70833c1..90491cb6 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +113,98 @@ msgstr "_Ακύρωση"
msgid "Choose location to save file"
msgstr "Επιλογή τοποθεσίας για αποθήκευση αρχείου"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpm έκδοση %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
+"\n"
+"χρήση:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - αυτόματη επιλογή πακέτων για την αναβάθμιση του "
+"συστήματος.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - εξαναγκάσμός επίκλησης ακόμα και εάν μερικά πακέτα δεν "
+"υπάρχουν.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+"\n"
+" ενεργοποιημένο"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+" --root - χρησιμοποίηση μία άλλη διαδρομή root για την εγκατάσταση "
+"του rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - επαλήθευσε μόνο ότι η εγκατάσταση μπορεί να επιτευχθεί "
+"σωστά.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - χρήση μόνο των μέσων που δόθηκαν στην αναζήτηση των "
+"ζητούμενων (ή των αναβαθμιζόμενων) πακέτων.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Δεν ορίστηκαν πακέτα"
@@ -275,6 +366,11 @@ msgstr "Η εγκατάσταση τελείωσε"
msgid "removing %s"
msgstr "αφαίρεση %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "Επανεκκίνηση urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -426,7 +522,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Η αντιγραφή απέτυχε"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "δεν έχει επιλεγεί το μέσο \"%s\""
@@ -892,6 +995,11 @@ msgstr "αφαίρεση μέσου \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -946,7 +1054,12 @@ msgstr "...η επαναρύθμιση απέτυχε"
msgid "reconfiguration done"
msgstr "επαναρύθμιση πέτυχε"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "δεν έχει επιλεγεί το μέσο \"%s\""
@@ -1205,13 +1318,6 @@ msgstr ""
"\n"
"χρήση:urpmf [επιλογές] μορφή-έκφραση (urpmf [options] pattern-expression\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - τύπωσε αυτό το μήνυμα βοήθειας.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1246,12 +1352,6 @@ msgstr ""
" --root - χρησιμοποίηση μία άλλη διαδρομή root για την εγκατάσταση "
"του rpm.\n"
-#: ../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"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1621,14 +1721,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - επαλήθευση ότι η αφαίρεση μπορεί να επιτευχθεί σωστά.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - εξαναγκάσμός επίκλησης ακόμα και εάν μερικά πακέτα δεν "
-"υπάρχουν.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1731,31 +1823,6 @@ msgstr " (ν/Ο) "
msgid "Removal failed"
msgstr "Η αφαίρεση απέτυχε"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpm έκδοση %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της "
-"GNU GPL.\n"
-"\n"
-"χρήση:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - χρήση μόνο των μέσων που δόθηκαν στην αναζήτηση των "
-"ζητούμενων (ή των αναβαθμιζόμενων) πακέτων.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1763,14 +1830,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - αυτόματη επιλογή πακέτων για την αναβάθμιση του "
-"συστήματος.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1891,13 +1950,6 @@ msgstr ""
" --allow-force - επέτρεψε στον χρήστη να ρωτάει για τα πακέτα χωρίς\n"
" να ελέγχει τις εξαρτήσεις και την ακεραιότητα.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-" --root - χρησιμοποίηση μία άλλη διαδρομή root για την εγκατάσταση "
-"του rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1975,24 +2027,6 @@ msgid ""
" next arg.\n"
msgstr ""
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-"\n"
-" ενεργοποιημένο"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - επαλήθευσε μόνο ότι η εγκατάσταση μπορεί να επιτευχθεί "
-"σωστά.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2313,12 +2347,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "Ακύρωση"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "Επανεκκίνηση urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Πατήστε enter όταν τελειώσετε..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3069,9 +3103,6 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
#~ "το αντιφατικό μέσο \"%s\" έχει αναφερθεί ως αφαιρούμενο αλλά δεν είναι "
#~ "πραγματικά"
-#~ msgid "Press Enter when ready..."
-#~ msgstr "Πατήστε enter όταν τελειώσετε..."
-
#, fuzzy
#~ msgid " -c - clean headers cache directory.\n"
#~ msgstr " -v - αναλυτική λειτουργία.\n"
diff --git a/po/eo.po b/po/eo.po
index 5baa6531..0b93929f 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +109,93 @@ msgstr "_Nuligu"
msgid "Choose location to save file"
msgstr "Elektu dosieraron por konservi tiun dosieron"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"mdkupdate versio %s\n"
+"Kopirajto © 1999-2005 Mandriva.\n"
+"Tio ĉi estas libera programaro kaj povas esti pludisdonata sub la termoj de "
+"GNU GPL.\n"
+"\n"
+"uzado:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - presu tiun ĉi help-mesaĝon.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - aŭtomate elektas pakaĵojn por ĝisdatigi la sistemon.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - trudu envokon eĉ se iuj pakaĵoj ne ekzistas.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - kontrolu rpm-signaturon antaŭ instalado\n"
+" (--no-verify-rpm elŝaltu ĝin, defaŭlta estas enŝaltita).\n"
+
+#: ../gurpmi.pm:52 ../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 - uzu nur la donitajn datenportilojn, disigitajn per komo.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+" --root - uzu alian vojprefikson por instali la RPM-aj dosieroj.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - kontrolu ĉu la instalado povas esti ĝuste arĥivota.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - uzu nur la donitajn datenportilojn por serĉi menditaj (aŭ "
+"ĝisdatigitaj) pakaĵoj.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Neniu pakaĵo indikita"
@@ -271,6 +357,11 @@ msgstr "Instalo finita"
msgid "removing %s"
msgstr "foriganta %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "restartas urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -421,7 +512,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Kopiado malsukcesis"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "medio \"%s\" ne estas elektata"
@@ -883,6 +981,11 @@ msgstr "foriganta datenportilon \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -937,7 +1040,12 @@ msgstr "...rekonfigurado malsukcesis"
msgid "reconfiguration done"
msgstr "rekonfigurado finita"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medio \"%s\" ne estas elektata"
@@ -1196,13 +1304,6 @@ msgstr ""
"\n"
"uzado:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - presu tiun ĉi help-mesaĝon.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1233,12 +1334,6 @@ msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
" --root - uzu alian vojprefikson por instali la RPM-aj dosieroj.\n"
-#: ../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 - uzu nur la donitajn datenportilojn, disigitajn per komo.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1602,12 +1697,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - kontrolu ĉu la instalado povas esti ĝuste arĥivota.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - trudu envokon eĉ se iuj pakaĵoj ne ekzistas.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1701,31 +1790,6 @@ msgstr " (J/n) "
msgid "Removal failed"
msgstr "Forigado malsukcesis"
-#: ../urpmi:69
-#, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdkupdate versio %s\n"
-"Kopirajto © 1999-2005 Mandriva.\n"
-"Tio ĉi estas libera programaro kaj povas esti pludisdonata sub la termoj de "
-"GNU GPL.\n"
-"\n"
-"uzado:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - uzu nur la donitajn datenportilojn por serĉi menditaj (aŭ "
-"ĝisdatigitaj) pakaĵoj.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1733,13 +1797,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - aŭtomate elektas pakaĵojn por ĝisdatigi la sistemon.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1855,12 +1912,6 @@ msgstr ""
" --allow-force - permesu peti uzulon instali pakaĵojn sen\n"
" dependaĵ-kontrolo kaj integreco.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-" --root - uzu alian vojprefikson por instali la RPM-aj dosieroj.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1943,23 +1994,6 @@ msgstr ""
" --bug - eligu cim-raporton en dosierujon indikitan de\n"
" next arg.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - kontrolu rpm-signaturon antaŭ instalado\n"
-" (--no-verify-rpm elŝaltu ĝin, defaŭlta estas enŝaltita).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - kontrolu ĉu la instalado povas esti ĝuste arĥivota.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2280,12 +2314,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "Nuligu"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "restartas urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Premu la enigklavon kiam vi pretas..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3020,9 +3054,6 @@ msgstr "Neniu \"changelog\" trovita\n"
#~ 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"
diff --git a/po/es.po b/po/es.po
index 7be4a2b0..d084a380 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +116,93 @@ msgstr "_Cancelar"
msgid "Choose location to save file"
msgstr "Elija ubicación para guardar archivo"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urmpi versión %s\n"
+"Copyright © 1999-2008 Mandriva.\n"
+"Esto es software libre y se debe redistribuir bajo los términos de la GNU "
+"GPL.\n"
+"\n"
+"uso:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - imprime este mensaje de ayuda.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - seleccionar automáticamente paquetes para actualizar "
+"sistema.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - fuerza invocación aunque no existan algunos paquetes.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - verificar la firma del rpm antes de la instalación.\n"
+" (--no-verify-rpm lo deshabilita, habilitado predet.).\n"
+
+#: ../gurpmi.pm:52 ../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 - usar sólo soportes dados, separados por comas.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - usar otra raíz para la instalación de rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - sólo verificar si se puede instalar sin problemas.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - usar sólo soportes dados para la búsqueda de los paquetes "
+"pedidos (o actualizados).\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Ningún paquete especificado"
@@ -275,6 +361,11 @@ msgstr "Finalizó la instalación"
msgid "removing %s"
msgstr "quitando %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "reiniciando urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -425,7 +516,14 @@ msgstr "Demasiados argumentos\n"
msgid "Copying failed"
msgstr "Falló la copia"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "el soporte «%s» no está seleccionado"
@@ -888,6 +986,11 @@ msgstr "quitando el soporte «%s»"
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -943,7 +1046,12 @@ msgstr "...falló la reconfiguración"
msgid "reconfiguration done"
msgstr "reconfiguración terminada"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "el soporte «%s» está al día"
@@ -1202,13 +1310,6 @@ msgstr ""
"\n"
"usage: urpmf [opciones] patrón-expresión\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - imprime este mensaje de ayuda.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1239,11 +1340,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - usar otra raíz para la instalación de rpm.\n"
-#: ../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 - usar sólo soportes dados, separados por comas.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1621,13 +1717,6 @@ msgstr ""
" --test - verificar si se puede llevar a cabo correctamante la "
"desinstalación.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - fuerza invocación aunque no existan algunos paquetes.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1726,31 +1815,6 @@ msgstr " (s/N) "
msgid "Removal failed"
msgstr "Falló la desinstalación"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urmpi versión %s\n"
-"Copyright © 1999-2008 Mandriva.\n"
-"Esto es software libre y se debe redistribuir bajo los términos de la GNU "
-"GPL.\n"
-"\n"
-"uso:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - usar sólo soportes dados para la búsqueda de los paquetes "
-"pedidos (o actualizados).\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1758,14 +1822,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - seleccionar automáticamente paquetes para actualizar "
-"sistema.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1883,11 +1939,6 @@ msgstr ""
" --allow-force - permitir preguntar al usuario para instalar paquetes sin\n"
" verificar las dependencias ni la integridad.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - usar otra raíz para la instalación de rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1972,23 +2023,6 @@ msgstr ""
" --bug - emitir un reporte de bug en el directorio indicado\n"
" por el argumento siguiente.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - verificar la firma del rpm antes de la instalación.\n"
-" (--no-verify-rpm lo deshabilita, habilitado predet.).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - sólo verificar si se puede instalar sin problemas.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2312,12 +2346,12 @@ msgstr[1] "¿Efectuar la instalación de los %d paquetes?"
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "reiniciando urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Presione «Intro» cuando esté listo..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3069,9 +3103,6 @@ msgstr "No se encontró changelog\n"
#~ 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"
diff --git a/po/et.po b/po/et.po
index f864161f..507ddbb4 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-03-06 14:15+0300\n"
"Last-Translator: Marek Laane <bald@starman.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -103,7 +103,96 @@ msgstr "_Loobu"
msgid "Choose location to save file"
msgstr "Valige faili salvestamise koht"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versioon %s\n"
+"Autoriõigus © 1999-2008 Mandriva.\n"
+"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+"Litsentsi tingimustele.\n"
+"\n"
+"kasutamine:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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äitab seda abiteadet.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - mitteinteraktiivne režiim, eeldatakse kõigile küsimustele "
+"vaikimisi pakutavaid vastuseid.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - valib automaatselt paketid süsteemi uuendamiseks.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - käivitatakse ka siis, kui mõnda nõutud paketti ei ole "
+"olemas.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - kontrollib RPM-i signatuuri enne paigaldust\n"
+" (--no-verify-rpm tühistab selle, vaikimisi on sees).\n"
+
+#: ../gurpmi.pm:52 ../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 - kasutatakse ainult määratud andmekandjaid (eraldajaks "
+"koma).\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - muu baasi kasutamine RPM-ide paigaldamisel.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - kontrollitakse, kas paigaldus on korrektselt võimalik.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - soovitud pakettide otsinguks kasutatakse ainult määratud "
+"andmekandjaid.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Pakette pole valitud"
@@ -261,6 +350,11 @@ msgstr "Paigaldus lõpetatud"
msgid "removing %s"
msgstr "%s eemaldamine"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "urpmi taaskäivitamine"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -413,7 +507,14 @@ msgstr "Liiga palju argumente\n"
msgid "Copying failed"
msgstr "Kopeerimine nurjus"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "andmekandja \"%s\" ei ole kättesaadav"
@@ -878,6 +979,11 @@ msgid "adding medium \"%s\""
msgstr "andmekandja \"%s\" lisamine"
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Keskkonna kataloogi %s ei ole olemas"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "see asukoht ei paista sisaldavat ühtegi distributsiooni"
@@ -890,7 +996,8 @@ msgstr "faili media.cfg parsimine nurjus"
#: ../urpm/media.pm:772
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "ligipääs distributsiooniandmekandjale nurjus (ei leitud faili media.cfg)"
+msgstr ""
+"ligipääs distributsiooniandmekandjale nurjus (ei leitud faili media.cfg)"
#: ../urpm/media.pm:790
#, c-format
@@ -932,7 +1039,12 @@ msgstr "...ümberseadistamine nurjus"
msgid "reconfiguration done"
msgstr "ümberseadistamine tehtud"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "Viga nimedefaili loomisel: sõltuvust %d ei leitud"
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "andmekandja \"%s\" on täiesti värske"
@@ -1191,13 +1303,6 @@ msgstr ""
"\n"
"kasutamine: urpmf [võtmed] pattern-expression\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - näitab seda abiteadet.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1234,13 +1339,6 @@ msgstr ""
" --urpmi-root - muu baasi kasutamine urpmi andmebaasi jaoks ja RPM-ide "
"paigaldamisel.\n"
-#: ../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 - kasutatakse ainult määratud andmekandjaid (eraldajaks "
-"koma).\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1612,14 +1710,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - kontrollitakse, kas eemaldamine on korrektselt võimalik.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - käivitatakse ka siis, kui mõnda nõutud paketti ei ole "
-"olemas.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1717,31 +1807,6 @@ msgstr " (j/E) "
msgid "Removal failed"
msgstr "Eemaldamine nurjus"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versioon %s\n"
-"Autoriõigus © 1999-2008 Mandriva.\n"
-"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
-"Litsentsi tingimustele.\n"
-"\n"
-"kasutamine:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - soovitud pakettide otsinguks kasutatakse ainult määratud "
-"andmekandjaid.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1751,12 +1816,6 @@ msgstr ""
" --auto - mitteinteraktiivne režiim, eeldatakse kõigile küsimustele "
"vaikimisi pakutavaid vastuseid.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - valib automaatselt paketid süsteemi uuendamiseks.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1874,11 +1933,6 @@ msgstr ""
" --allow-force - lubab kasutajal paigaldada pakette ilma\n"
" sõltuvusi ja sobivust kontrollimata.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - muu baasi kasutamine RPM-ide paigaldamisel.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1964,23 +2018,6 @@ msgstr ""
" --bug - väljastab vearaporti kataloogi, mis on ära näidatud\n"
" järgnevas argumendis.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - kontrollib RPM-i signatuuri enne paigaldust\n"
-" (--no-verify-rpm tühistab selle, vaikimisi on sees).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - kontrollitakse, kas paigaldus on korrektselt võimalik.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2305,12 +2342,12 @@ msgstr[1] "Kas paigaldada %d paketti?"
msgid "Cancel"
msgstr "Loobu"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "urpmi taaskäivitamine"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Vajutage Enter, kui see on tehtud..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -3084,18 +3121,12 @@ msgstr "Muutuste logi ei leitud\n"
#~ 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"
-#~ msgid "Error generating names file: dependency %d not found"
-#~ msgstr "Viga nimedefaili loomisel: sõltuvust %d ei leitud"
-
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr "Viga nimedefaili loomisel: faili kirjutamine ebaõnnestus (%s)"
diff --git a/po/eu.po b/po/eu.po
index 857ae1d3..43e13d0b 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-03-03 19:55+0100\n"
"Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
"Language-Team: Euskara <eu@li.org>\n"
@@ -105,7 +105,98 @@ msgstr "_Utzi"
msgid "Choose location to save file"
msgstr "Aukeratu fitxategiko gordetzeko kokalekua"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi %s bertsioa\n"
+"Copyright © 1999-2005 Mandriva.\n"
+"Software askea da hau eta GNU-ren GPL-k ezarritako baldintzak jarraituz "
+"birbanatu daiteke.\n"
+"\n"
+"erabilera:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - laguntza-mezu hau inprimatzen du.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - modu ez-interaktiboa, galderen erantzun lehenetsiak "
+"erabili.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - automatikoki sistemaren bertsioa berritzeko paketeak "
+"hautatzen ditu\n"
+
+#: ../gurpmi.pm:49 ../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"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - egiaztatu rpm sinadura instalatu aurretik\n"
+" (--no-verify-rpm ezgaitzeko, era lehenetsian gaituta "
+"dago).\n"
+
+#: ../gurpmi.pm:52 ../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 - emandako euskarria bakarrik erabiltzen du, komaz "
+"bereizita.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - beste root bat erabiltzen du rpm instalatzeko.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - instalazioa zuzen gauzatu daitekeen egiaztatzen du.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - soilik adierazitako euskarria erabiltzen du eskatutako "
+"paketeak bilatzeko.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Ez da paketerik zehaztu"
@@ -179,12 +270,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
@@ -261,6 +354,11 @@ msgstr "Instalazioa amaitu da"
msgid "removing %s"
msgstr "%s kentzen"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "urpmi berrabiarazten"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -413,7 +511,14 @@ msgstr "Argumentu gehiegi\n"
msgid "Copying failed"
msgstr "Ezin izan da kopiatu"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "\"%s\" euskarria ez dago eskuragarri"
@@ -592,7 +697,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)"
@@ -796,7 +902,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
@@ -808,12 +915,14 @@ 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
@@ -880,6 +989,11 @@ msgid "adding medium \"%s\""
msgstr "\"%s\" euskarria eransten"
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "%s ingurune direktorioa ez da existitzen"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "kokapen honek ez dirudi banaketarik daukanik"
@@ -934,7 +1048,12 @@ msgstr "...birkonfiguraketak hutsegin du"
msgid "reconfiguration done"
msgstr "birkonfiguraketa amaituta"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" euskarria egunean dago"
@@ -1193,13 +1312,6 @@ msgstr ""
"\n"
"erabilera: urpmf [aukerak] adierazpen-patroia\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - laguntza-mezu hau inprimatzen du.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1215,11 +1327,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"
@@ -1229,18 +1343,13 @@ 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"
-
-#: ../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 - emandako euskarria bakarrik erabiltzen du, komaz "
-"bereizita.\n"
+" --urpmi-root - erabili beste erro bat urpmi db eta rpm instalatzeko.\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 - euskarriak komaz bereizitako azpikateen arabera "
"ordenatzen ditu.\n"
@@ -1253,7 +1362,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
@@ -1278,7 +1388,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
@@ -1498,7 +1609,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"
@@ -1605,11 +1717,6 @@ msgstr " --auto - automatikoki pakete bat hautatzen du aukeratik.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
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"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1685,7 +1792,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"
@@ -1706,30 +1814,6 @@ msgstr " (b/E) "
msgid "Removal failed"
msgstr "Kentzean huts egin du"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi %s bertsioa\n"
-"Copyright © 1999-2005 Mandriva.\n"
-"Software askea da hau eta GNU-ren GPL-k ezarritako baldintzak jarraituz "
-"birbanatu daiteke.\n"
-"\n"
-"erabilera:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - soilik adierazitako euskarria erabiltzen du eskatutako "
-"paketeak bilatzeko.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1739,13 +1823,6 @@ msgstr ""
" --auto - modu ez-interaktiboa, galderen erantzun lehenetsiak "
"erabili.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - automatikoki sistemaren bertsioa berritzeko paketeak "
-"hautatzen ditu\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1819,7 +1896,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
@@ -1838,7 +1916,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"
@@ -1861,11 +1940,6 @@ msgstr ""
" --allow-force - erabiltzaileari paketeak instalatzeko eskatzeko aukera\n"
"ematen du, mendekotasunak eta osotasuna egiaztatu gabe.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - beste root bat erabiltzen du rpm instalatzeko.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1954,23 +2028,6 @@ msgstr ""
"argumentuak\n"
" adierazitako direktorioan.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - egiaztatu rpm sinadura instalatu aurretik\n"
-" (--no-verify-rpm ezgaitzeko, era lehenetsian gaituta "
-"dago).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - instalazioa zuzen gauzatu daitekeen egiaztatzen du.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -1984,7 +2041,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
@@ -2023,7 +2081,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
@@ -2033,7 +2092,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
@@ -2053,7 +2113,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
@@ -2077,8 +2138,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
@@ -2291,12 +2354,12 @@ msgstr[1] "%d paketeen instalaketarekin jarraitu nahi duzu?"
msgid "Cancel"
msgstr "Utzi"
-#: ../urpmi:665
+#: ../urpmi:635
#, c-format
-msgid "restarting urpmi"
-msgstr "urpmi berrabiarazten"
+msgid "Press Enter when mounted..."
+msgstr ""
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2343,7 +2406,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
@@ -2353,7 +2417,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
@@ -2481,7 +2546,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
@@ -2538,7 +2604,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"
@@ -2719,7 +2786,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
@@ -2744,7 +2812,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
@@ -2832,17 +2901,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"
@@ -2963,14 +3036,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
@@ -2987,7 +3062,8 @@ 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
@@ -3015,14 +3091,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"
@@ -3031,4 +3109,3 @@ msgstr ""
#, c-format
msgid "No changelog found\n"
msgstr "Ez da changelog aurkitu\n"
-
diff --git a/po/fa.po b/po/fa.po
index c64a7740..e582dfe6 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2005-02-06 08:42-0500\n"
"Last-Translator: \n"
"Language-Team: <en@li.org>\n"
@@ -106,7 +106,91 @@ msgstr "_لغو"
msgid "Choose location to save file"
msgstr "مکان ذخیره‌ی پرونده را انتخاب کنید"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\n"
+"Copyright © 1999-2008 Mandriva.\n"
+"این نرم‌افزار آزاد است ممکن است تحت شرایط GNU GPL پخش مجدد گردد.\n"
+"\n"
+"طرز استفاده:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - انتخاب بطور خودکار بسته‌ها برای ارتقای سیستم.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - اجبار درخواست حتی اگر بعضی از بسته ها وجود ندارند.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - تصدیق امضاهای rpm قبل از نصب\n"
+" (--no-verify-rpm غیر فعال شود، پیش‌فرض فعال شده است).\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - استفاده از ریشه‌ی دیگری برای نصب rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - تصدیق کردن اینکه آیا نصب می‌تواند بدرستی انجام پذیرد.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - فقط از رسانه داده شده برای جستجوی بسته‌های درخواست شده "
+"استفاده گردد.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "هیچ بسته‌ای با نام %s"
@@ -263,6 +347,11 @@ msgstr "نصب پایان یافت"
msgid "removing %s"
msgstr "برداشتن %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "راه‌اندازی دوباره‌ی urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -413,7 +502,14 @@ msgstr ""
msgid "Copying failed"
msgstr "کپی کردن شکست خورد"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "رسانه \"%s\" انتخاب نشده است"
@@ -875,6 +971,11 @@ msgstr "برداشتن رسانه‌ی \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -928,7 +1029,12 @@ msgstr "...تنظیم مجدد شکست خورد"
msgid "reconfiguration done"
msgstr "تنظیم مجدد انجام گردید"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "رسانه \"%s\" انتخاب نشده است"
@@ -1186,13 +1292,6 @@ msgstr ""
"\n"
"طرز استفاده:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - چاپ این پیغام راهنما.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1222,12 +1321,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - استفاده از ریشه‌ی دیگری برای نصب rpm.\n"
-#: ../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"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1592,13 +1685,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - تصدیق کردن اینکه آیا حذف می‌تواند بدرستی انجام پذیرد.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - اجبار درخواست حتی اگر بعضی از بسته ها وجود ندارند.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1691,30 +1777,6 @@ msgstr " (y/N) "
msgid "Removal failed"
msgstr "برداشتن شکست خورد"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi version %s\n"
-"Copyright © 1999-2008 Mandriva.\n"
-"این نرم‌افزار آزاد است ممکن است تحت شرایط GNU GPL پخش مجدد گردد.\n"
-"\n"
-"طرز استفاده:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - فقط از رسانه داده شده برای جستجوی بسته‌های درخواست شده "
-"استفاده گردد.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1722,12 +1784,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - انتخاب بطور خودکار بسته‌ها برای ارتقای سیستم.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1839,11 +1895,6 @@ msgstr ""
" --allow-force - اجازه‌ی پرسش از کاربر برای نصب بسته‌ها بدون\n"
" بررسی وابستگی و درستی آنها.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - استفاده از ریشه‌ی دیگری برای نصب rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1927,23 +1978,6 @@ msgstr ""
" --bug - بیرون‌ریزی یک گزارش اشکال در شاخه‌ی مشخص شده بوسیله\n"
" مبحث بعدی.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - تصدیق امضاهای rpm قبل از نصب\n"
-" (--no-verify-rpm غیر فعال شود، پیش‌فرض فعال شده است).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - تصدیق کردن اینکه آیا نصب می‌تواند بدرستی انجام پذیرد.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2259,12 +2293,12 @@ msgstr[0] ""
msgid "Cancel"
msgstr "لغو"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "راه‌اندازی دوباره‌ی urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "وقتی آماده‌اید ورود را فشار دهید..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3011,9 +3045,6 @@ msgstr "هیچ ثبت تغییری یافت نشد\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"
diff --git a/po/fi.po b/po/fi.po
index ee309005..3810c3b8 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +110,92 @@ msgstr "_Peruuta"
msgid "Choose location to save file"
msgstr "Valitse hakemisto johon tiedosto tallennetaan"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Tämä on vapaa ohjelmisto, jota saa levittää GNU GPL -lisenssin mukaisesti.\n"
+"\n"
+"käyttö:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - tulosta tämä viesti\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - ei-interaktiivinen tila, kaikkiin kysymyksiin vastataan\n"
+" oletusarvon mukaisesti.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - valitse automaattisesti päivitettävät paketit\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - pakottaa asennuksen vaikka joitakin paketteja puuttuu\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - varmista rpm-allekirjoitus ennen asennusta\n"
+" (--no-verify-rpm poistaa käytöstä, vakiona käytössä).\n"
+
+#: ../gurpmi.pm:52 ../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 - käytä ainoastaan seuraavia pilkuilla eroteltuja medioita\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - käytä määriteltyä juurta rpm-asennukselle\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - suorita vain asennuksen onnistumisen tarkistus\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - käytä ainoastaan annettuja medioita pyydetyn paketin\n"
+" hakemiseen.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Paketteja ei annettu"
@@ -268,6 +353,11 @@ msgstr "Asennus on valmis"
msgid "removing %s"
msgstr "poistetaan %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "uudelleenkäynnistetään urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -418,7 +508,14 @@ msgstr "Liian monta argumenttia\n"
msgid "Copying failed"
msgstr "Kopiointi epäonnistui"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "media \"%s\" ei ole saatavilla"
@@ -879,6 +976,11 @@ msgid "adding medium \"%s\""
msgstr "lisätään media \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Ympäristökansio %s ei ole olemassa"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "tämä sijainti ei vaikuta sisältävän jakelua"
@@ -933,7 +1035,12 @@ msgstr "...uudelleenasetus epäonnistui"
msgid "reconfiguration done"
msgstr "uudelleenasetus tehty"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "Virhe luodessa names-tiedostoa: riippuvuutta %d ei löytynyt"
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "media \"%s\" on ajan tasalla"
@@ -1191,13 +1298,6 @@ msgstr ""
"\n"
"käyttö: urpmf [valitsimet] hakulauseke\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - tulosta tämä viesti\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1231,12 +1331,6 @@ msgstr ""
" --urpmi-root - käytä määriteltyä juurta urpmin tietokannalle ja\n"
" rpm-pakettien asentamiseen.\n"
-#: ../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 - käytä ainoastaan seuraavia pilkuilla eroteltuja medioita\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1609,13 +1703,6 @@ msgstr " --auto - valitse automaattisesti paketit tarvittaessa\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - varmista että poisto voidaan hoitaa oikein\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - pakottaa asennuksen vaikka joitakin paketteja puuttuu\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1710,30 +1797,6 @@ msgstr " (k/E) "
msgid "Removal failed"
msgstr "Poisto epäonnistui"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Tämä on vapaa ohjelmisto, jota saa levittää GNU GPL -lisenssin mukaisesti.\n"
-"\n"
-"käyttö:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - käytä ainoastaan annettuja medioita pyydetyn paketin\n"
-" hakemiseen.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1743,12 +1806,6 @@ msgstr ""
" --auto - ei-interaktiivinen tila, kaikkiin kysymyksiin vastataan\n"
" oletusarvon mukaisesti.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - valitse automaattisesti päivitettävät paketit\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1866,11 +1923,6 @@ msgstr ""
" --allow-force - salli pakettien asennus ilman riippuvuuksien ja\n"
" eheyden tarkistusta\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - käytä määriteltyä juurta rpm-asennukselle\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1953,22 +2005,6 @@ msgstr ""
" --bug - kirjoittaa virheraportin hakemistoon joka määritellään\n"
" seuraavassa argumentissa\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - varmista rpm-allekirjoitus ennen asennusta\n"
-" (--no-verify-rpm poistaa käytöstä, vakiona käytössä).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - suorita vain asennuksen onnistumisen tarkistus\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2295,12 +2331,12 @@ msgstr[1] "Asennetaanko nämä %d pakettia?"
msgid "Cancel"
msgstr "Peruuta"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "uudelleenkäynnistetään urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Paina Enter kun olet valmis..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3055,18 +3091,12 @@ msgstr "Muutoslokia ei löytynyt\n"
#~ 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"
-#~ msgid "Error generating names file: dependency %d not found"
-#~ msgstr "Virhe luodessa names-tiedostoa: riippuvuutta %d ei löytynyt"
-
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr "Virhe luodessa names-tiedostoa: Tiedostoon ei voida kirjoittaa (%s)"
diff --git a/po/fr.po b/po/fr.po
index ee74bb0b..a4e953fa 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-03-03 20:25+0100\n"
"Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
"Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
@@ -123,7 +123,102 @@ msgstr "_Annuler"
msgid "Choose location to save file"
msgstr "Choisissez un emplacement pour enregistrer le fichier."
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\n"
+"Copyright © 1999-2008 Mandriva.\n"
+"Ceci est un logiciel libre pouvant être redistribué selon les termes de la "
+"licence GNU GPL.\n"
+"\n"
+"usage :\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - afficher ce message d'aide\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - mode non intéractif, utilisation des paramètres par "
+"défaut.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - sélection automatique des paquetages à mettre à jour.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - forcer l'invocation même si certains paquetages "
+"n'existent\n"
+" pas.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - vérifier la signature du rpm avant l'installation.\n"
+" (--no-verify-rpm le désactive, activé par défaut).\n"
+
+# Les espaces supplémentaires sur la seconde ligne
+# sont volontaires
+#: ../gurpmi.pm:52 ../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 - utiliser seulement les médias listés (séparés par des\n"
+" virgules).\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+" --root - utiliser un autre répertoire racine pour l'installation.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - vérifier si l'installation peut se dérouler "
+"correctement.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - utiliser seulement le média spécifié pour rechercher\n"
+" (ou mettre à jour) les paquetages\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Pas de paquetage spécifié"
@@ -284,6 +379,11 @@ msgstr "L'installation est terminée"
msgid "removing %s"
msgstr "désinstallation de %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "Redémarrage de urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -436,7 +536,14 @@ msgstr "Trop d'arguments\n"
msgid "Copying failed"
msgstr "La copie a échoué"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "le média « %s » n'est pas disponible"
@@ -902,6 +1009,11 @@ msgid "adding medium \"%s\""
msgstr "ajout du média « %s »"
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Le répertoire d'environnement %s n'existe pas"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "cet emplacement ne semble pas contenir de distribution"
@@ -958,7 +1070,12 @@ msgstr "... la reconfiguration a échoué"
msgid "reconfiguration done"
msgstr "reconfiguration effectuée"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "le média « %s » est à jour"
@@ -1217,13 +1334,6 @@ msgstr ""
"\n"
"usage : urpmf [options] expression\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - afficher ce message d'aide\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1260,15 +1370,6 @@ msgstr ""
" --urpmi-root - utiliser un autre répertoire racine pour l'installation "
"et la base de donnée urpmi.\n"
-# Les espaces supplémentaires sur la seconde ligne
-# sont volontaires
-#: ../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 - utiliser seulement les médias listés (séparés par des\n"
-" virgules).\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1647,15 +1748,6 @@ msgstr ""
" --test - vérifier si la désinstallation peut être achevée "
"correctement.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - forcer l'invocation même si certains paquetages "
-"n'existent\n"
-" pas.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1759,31 +1851,6 @@ msgstr " (o/N) "
msgid "Removal failed"
msgstr "Échec de la désinstallation"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi version %s\n"
-"Copyright © 1999-2008 Mandriva.\n"
-"Ceci est un logiciel libre pouvant être redistribué selon les termes de la "
-"licence GNU GPL.\n"
-"\n"
-"usage :\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - utiliser seulement le média spécifié pour rechercher\n"
-" (ou mettre à jour) les paquetages\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1793,13 +1860,6 @@ msgstr ""
" --auto - mode non intéractif, utilisation des paramètres par "
"défaut.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - sélection automatique des paquetages à mettre à jour.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1927,12 +1987,6 @@ msgstr ""
" --allow-force - autoriser l'installation des paquetages sans vérifier\n"
" ni les dépendances ni l'intégrité.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-" --root - utiliser un autre répertoire racine pour l'installation.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -2020,24 +2074,6 @@ msgstr ""
" --bug - générer un rapport d'anomalie dans le répertoire\n"
" indiqué en second argument.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - vérifier la signature du rpm avant l'installation.\n"
-" (--no-verify-rpm le désactive, activé par défaut).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - vérifier si l'installation peut se dérouler "
-"correctement.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2380,12 +2416,12 @@ msgstr[1] "Procéder à l'installation des %d paquetages ?"
msgid "Cancel"
msgstr "Annuler"
-#: ../urpmi:665
+#: ../urpmi:635
#, c-format
-msgid "restarting urpmi"
-msgstr "Redémarrage de urpmi"
+msgid "Press Enter when mounted..."
+msgstr ""
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
diff --git a/po/fur.po b/po/fur.po
index bf7d36b6..31a9b4a3 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +105,94 @@ msgstr "_Scancele"
msgid "Choose location to save file"
msgstr "Sielç un puest dulà salvâ il file"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Chest software al è software libar e al po sedi redistribuît sot i termins "
+"de GNU GPL.\n"
+"\n"
+"ûs:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - stampe chist mes di jutori.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - selezione automatichementri i pachets par atualizâ il "
+"sisteme.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - sfuarçe le esecuzion ancje se cualchi pachet no l'esist.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - verifiche le firme RPM prin de instalazion\n"
+" (--no-verify-rpm le disabilite, predefinide abilitade).\n"
+
+#: ../gurpmi.pm:52 ../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 - dopre dome les fonts te liste, disseparadis di virgulis.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+" --root - dopre une altre cartele di root par instalâ i file rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - verifiche se le instalazion e po sedi fate coretementri.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --media - dopre dome les fonts te liste, disseparadis di virgulis.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Nissun comant specificât"
@@ -263,6 +350,11 @@ msgstr "Instalazion finide"
msgid "removing %s"
msgstr "rimozion di %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "rinviament di urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -414,7 +506,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Copie falade"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "le font \"%s\" no je selezionade"
@@ -879,6 +978,11 @@ msgstr "o rimôf le font \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -934,7 +1038,12 @@ msgstr "Configurazion dal menu salvade"
msgid "reconfiguration done"
msgstr "Configurazion Server"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "le font \"%s\" no je selezionade"
@@ -1193,13 +1302,6 @@ msgstr ""
"\n"
"û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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - stampe chist mes di jutori.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1232,12 +1334,6 @@ msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
" --root - dopre une altre cartele di root par instalâ i file rpm.\n"
-#: ../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 - dopre dome les fonts te liste, disseparadis di virgulis.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1617,13 +1713,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - verifiche se le instalazion e po sedi fate coretementri.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - sfuarçe le esecuzion ancje se cualchi pachet no l'esist.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1721,30 +1810,6 @@ msgstr " (s/N) "
msgid "Removal failed"
msgstr "Rimozion falade"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Chest software al è software libar e al po sedi redistribuît sot i termins "
-"de GNU GPL.\n"
-"\n"
-"ûs:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --media - dopre dome les fonts te liste, disseparadis di virgulis.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1752,14 +1817,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - selezione automatichementri i pachets par atualizâ il "
-"sisteme.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1881,12 +1938,6 @@ msgstr ""
" --allow-force - permet di domandâ al utent di instalâ i pachets cence\n"
" controlâ dipendencis e integritât.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-" --root - dopre une altre cartele di root par instalâ i file rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1969,23 +2020,6 @@ msgstr ""
" --bug - stampe un rapuart di bug te cartele specificade dal\n"
" argoment seguitîf.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - verifiche le firme RPM prin de instalazion\n"
-" (--no-verify-rpm le disabilite, predefinide abilitade).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - verifiche se le instalazion e po sedi fate coretementri.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2298,12 +2332,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "Scancele"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "rinviament di urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Frache Enter cuant che tu sês pront..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3052,9 +3086,6 @@ msgstr "Nissun changelog cjatât\n"
#~ 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"
diff --git a/po/ga.po b/po/ga.po
index d1e095c4..4500a5d7 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +85,79 @@ msgstr "_Cealaigh"
msgid "Choose location to save file"
msgstr ""
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 ""
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
+#, c-format
+msgid " --media - use only the given media, separated by comma.\n"
+msgstr ""
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "pacáiste ar bith den ainm %s"
@@ -236,6 +308,11 @@ msgstr "Theip ag feistiú"
msgid "removing %s"
msgstr "ag feistiú %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr ""
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -384,7 +461,14 @@ msgstr ""
msgid "Copying failed"
msgstr "theip ar feistiú"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "Tá an próifíl \"%s\" ann cheana!"
@@ -843,6 +927,11 @@ msgstr "léamh depslist comhad [%s]"
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -896,7 +985,12 @@ msgstr "Cumraigh 'fetchmail'"
msgid "reconfiguration done"
msgstr "Cumraíocht Xorg"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr ""
@@ -1149,13 +1243,6 @@ msgid ""
"usage: urpmf [options] pattern-expression\n"
msgstr ""
-#: ../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 ""
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1184,11 +1271,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
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 ""
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1542,12 +1624,6 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1640,23 +1716,6 @@ msgstr " (T/n) "
msgid "Removal failed"
msgstr "Scríos modúil"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1664,12 +1723,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1772,11 +1825,6 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1849,20 +1897,6 @@ msgid ""
" next arg.\n"
msgstr ""
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2150,12 +2184,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "Cealaigh"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr ""
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Brú Enter nuair atá sin déanta agat..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2822,10 +2856,6 @@ msgstr ""
#~ 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"
diff --git a/po/gl.po b/po/gl.po
index f408dab0..03382f72 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +108,96 @@ msgstr "_Cancelar"
msgid "Choose location to save file"
msgstr "Escolla a localización onde se gardará o ficheiro"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versión %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Isto é software libre e pode redistribuírse baixo os termos da GNU GPL.\n"
+"\n"
+"uso:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - amosa esta mensaxe de axuda.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - modo non-interactivo, tómanse as respostas "
+"predeterminadas para as preguntas.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - seleccionar automáticamente os paquetes para actualizar o "
+"sistema.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - forzar a invocación incluso se algún paquete non existe.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - verificar a sinatura do rpm antes de\n"
+" instalalo (--no-verify-rpm desactívaa, por\n"
+" defecto está activada).\n"
+
+#: ../gurpmi.pm:52 ../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 - usar só os soportes dados, separados por comas.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - usar outra raíz para a instalación de rpms.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - só verifica se se pode conseguir instalar de maneira "
+"correcta.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - usar só o soporte dado para buscar os paquetes "
+"solicitados.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Non especificou ningún paquete"
@@ -266,6 +355,11 @@ msgstr "Instalación rematada"
msgid "removing %s"
msgstr "eliminando %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "reiniciando urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -416,7 +510,14 @@ msgstr "Demasiados argumentos\n"
msgid "Copying failed"
msgstr "Fallo ó copiar"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "o soporte \"%s\" non está seleccionado"
@@ -879,6 +980,11 @@ msgid "adding medium \"%s\""
msgstr "eliminando o soporte \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "O directorio de ambiente %s non existe"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -935,7 +1041,12 @@ msgstr "...fallo ó reconfigurar"
msgid "reconfiguration done"
msgstr "...fallo ó reconfigurar"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "Erro ó xerar o ficheiro de nomes: non se atopou a dependencia %d"
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "o soporte \"%s\" non está seleccionado"
@@ -1193,13 +1304,6 @@ msgstr ""
"\n"
"uso: urpmf [opcións] expresión-patrón\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - amosa esta mensaxe de axuda.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1228,11 +1332,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - usar outra raíz para a instalación de rpms.\n"
-#: ../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 - usar só os soportes dados, separados por comas.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1605,13 +1704,6 @@ msgstr ""
" --test - verifica se a eliminación se pode facer de xeito "
"correcto.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - forzar a invocación incluso se algún paquete non existe.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1709,30 +1801,6 @@ msgstr " (s/N) "
msgid "Removal failed"
msgstr "Fallo ó eliminar"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versión %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Isto é software libre e pode redistribuírse baixo os termos da GNU GPL.\n"
-"\n"
-"uso:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - usar só o soporte dado para buscar os paquetes "
-"solicitados.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1742,14 +1810,6 @@ msgstr ""
" --auto - modo non-interactivo, tómanse as respostas "
"predeterminadas para as preguntas.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - seleccionar automáticamente os paquetes para actualizar o "
-"sistema.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1865,11 +1925,6 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - usar outra raíz para a instalación de rpms.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1953,25 +2008,6 @@ msgstr ""
" --bug - crear un informe de erro no directorio indicado\n"
" polo seguinte argumento.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - verificar a sinatura do rpm antes de\n"
-" instalalo (--no-verify-rpm desactívaa, por\n"
-" defecto está activada).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - só verifica se se pode conseguir instalar de maneira "
-"correcta.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2294,12 +2330,12 @@ msgstr[1] "Continuar ca instalación dos %d paquetes? (%d MB)"
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "reiniciando urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Prema Enter cando estea preparado..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -3037,9 +3073,6 @@ msgstr "Non se atopou o changelog\n"
#~ 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"
@@ -3047,9 +3080,6 @@ msgstr "Non se atopou o changelog\n"
#~ msgid "virtual medium needs to be local"
#~ msgstr "os soportes virtuais deben ser locais"
-#~ msgid "Error generating names file: dependency %d not found"
-#~ msgstr "Erro ó xerar o ficheiro de nomes: non se atopou a dependencia %d"
-
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr ""
#~ "Erro ó xerar o ficheiro de nomes: Non se puido escribir no ficheiro (%s)"
diff --git a/po/he.po b/po/he.po
index 6b26b6c5..f04fcaec 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-03-08 23:26+0200\n"
"Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
"Language-Team: Hebrew\n"
@@ -110,7 +110,88 @@ msgstr "_ביטול"
msgid "Choose location to save file"
msgstr "עליך לבחור מקום לשמירת הקובץ"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"גרסת urpmi %s\n"
+"כל הזכויות שמורות (C) 1999-2008 Mandriva.\n"
+"זוהי תוכנה חופשית וניתן להפיצה בהתאם לתנאי הרישיון GNU GPL.\n"
+"\n"
+"\n"
+"שימוש:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../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"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - אלץ הפעלה גם אם חלק מהחבילות חסרות.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - בדוק את חתימת החבילה לפני ההתקנה\n"
+" (--no-verify-rpm מבטל זאת, ברירת המחדל היא להפעיל\").\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - השתמש בשורש מערכת קבצים אחר להתקנת חבילות.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - רק וידוא שהתקנת החבילה יכולה להסתיים בהצלחה.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr " --searchmedia - השתמש רק במקור הנתון לחיפוש החבילות המבוקשות.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "לא צוינו חבילות"
@@ -184,12 +265,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
@@ -266,6 +349,11 @@ msgstr "ההתקנה הסתיימה"
msgid "removing %s"
msgstr "מסיר %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "מפעיל מחדש את urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -416,7 +504,14 @@ msgstr "יותר מדי משתנים\n"
msgid "Copying failed"
msgstr "ההעתקה נכשלה"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "המקור \"%s\" אינו זמין"
@@ -593,7 +688,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
@@ -877,6 +973,11 @@ msgid "adding medium \"%s\""
msgstr "מוסיף את המקור \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "ספרית ה-chroot אינה קיימת"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -931,7 +1032,12 @@ msgstr "...ההגדרה מחדש נכשלה"
msgid "reconfiguration done"
msgstr "ההגדרה מחדש הושלמה"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "המקור \"%s\" עדכני"
@@ -1190,13 +1296,6 @@ msgstr ""
"\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - הצגת הודעת עזרה זו.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1214,7 +1313,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
@@ -1222,16 +1322,13 @@ 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"
-
-#: ../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"
+msgstr ""
+" --urpmi-root - השתמש בשורש מערכת קבצים אחר ל-urpmi db והתקנת rpm\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 - מיון מדיה בהתאם לכותרות משנה המופרדים ע\"י פסיק.\n"
#: ../urpm/search.pm:43 ../urpmf:43
@@ -1483,7 +1580,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
@@ -1588,11 +1686,6 @@ msgstr " --auto - בחירה אוטומטית של חבילה מהאפ
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - בדיקה האם הסרת החבילה יכולה להסתיים בהצלחה.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - אלץ הפעלה גם אם חלק מהחבילות חסרות.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1665,7 +1758,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 החבילות הבאות ייוסרו"
@@ -1686,28 +1780,6 @@ msgstr " (כן/*לא) "
msgid "Removal failed"
msgstr "ההסרה נכשלה"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"גרסת urpmi %s\n"
-"כל הזכויות שמורות (C) 1999-2008 Mandriva.\n"
-"זוהי תוכנה חופשית וניתן להפיצה בהתאם לתנאי הרישיון GNU GPL.\n"
-"\n"
-"\n"
-"שימוש:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - השתמש רק במקור הנתון לחיפוש החבילות המבוקשות.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1715,11 +1787,6 @@ msgid ""
"questions.\n"
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"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1745,7 +1812,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
@@ -1785,7 +1853,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
@@ -1809,7 +1878,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
@@ -1830,11 +1900,6 @@ msgstr ""
" --allow-force - מאפשר לתשאל את המשתמש אודות התקנת חבילות\n"
" בלי בדיקת תלויות.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - השתמש בשורש מערכת קבצים אחר להתקנת חבילות.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1917,22 +1982,6 @@ msgstr ""
" --bug - ייצר קובץ שגיאות בספריה הנתונה על ידי\n"
" המשתנה הבא.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - בדוק את חתימת החבילה לפני ההתקנה\n"
-" (--no-verify-rpm מבטל זאת, ברירת המחדל היא להפעיל\").\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - רק וידוא שהתקנת החבילה יכולה להסתיים בהצלחה.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2036,7 +2085,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
@@ -2044,7 +2094,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
@@ -2247,12 +2298,12 @@ msgstr[1] "להמשיך בהתקנת %d החבילות?"
msgid "Cancel"
msgstr "ביטול"
-#: ../urpmi:665
+#: ../urpmi:635
#, c-format
-msgid "restarting urpmi"
-msgstr "מפעיל מחדש את urpmi"
+msgid "Press Enter when mounted..."
+msgstr ""
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -2375,7 +2426,8 @@ msgstr " --nopubkey - אל תייבא את מפתח האימות של המ
#: ../urpmi.addmedia:79
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - הוסף את המקור לרשימה, אבל אל תעדכן את רשימת הקבצים.\n"
+msgstr ""
+" --raw - הוסף את המקור לרשימה, אבל אל תעדכן את רשימת הקבצים.\n"
#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
@@ -2475,7 +2527,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
@@ -2760,7 +2813,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
@@ -2770,7 +2824,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
@@ -2827,7 +2882,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
@@ -2924,16 +2980,17 @@ 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
#, c-format
msgid "No changelog found\n"
msgstr "לא נמצאה רשימת שינויים\n"
-
diff --git a/po/hi.po b/po/hi.po
index df51449f..5d2b929c 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2005-08-23 20:11+0530\n"
"Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
"Language-Team: Hindi, India\n"
@@ -104,7 +104,93 @@ msgstr "खत्म करें (_C)"
msgid "Choose location to save file"
msgstr "संचिका को सुरक्षित करने के स्थान का चयन करें"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"यू०आर०पी०एम०आई० संस्मरण %s\n"
+"सर्वाधिकार (C) १९९९-२००४ मैनड्रिव सॉफ़्ट ।\n"
+"यह एक मुक्त सॉफ़्टवेयर है और जी०एन०यू० सामान्य जन अधिकार-पत्र के अन्तर्गत पुनः वितरित "
+"किया जा सकता है।\n"
+"\n"
+"उपयोग विधि:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - प्रणाली को उन्नयन बनाने के लिए, स्वतः पैकेजों का चयन करें\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - यद्यपि कुछ पैकेज ना विद्यमान हो, तो भी इनवोकेशन को बल-पूर्वक लागू "
+"करें \n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - संसाधन के पहिले, आर०पी०एम० हस्ताक्षर की जाँच करें\n"
+" (--no-verify-rpm इसे अयोग्य करता है, डिफ़ॉल्ट जाँच के साथ है).\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - आरपीएम संसाधन के लिए अन्य रूट का उपयोग\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - जाँच करें कि संसाधन सफ़लता-पूर्वक किया जा सकता है\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - निवेदित (या अपडेट किये हुए) पैकेजों की खोज के लिए, सिर्फ़ दिए गए "
+"माध्यम का उपयोग करें ।\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "%s नाम का कोई पैकेज नहीं है"
@@ -263,6 +349,11 @@ msgstr "संसाधन समाप्त"
msgid "removing %s"
msgstr "%s को हटाया जा रहा है"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "यू०आर०पी०एम०आई० को पुनः आरम्भ किया जा रहा है"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -413,7 +504,14 @@ msgstr ""
msgid "Copying failed"
msgstr "प्रतिलिपि बनना असफ़ल"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "माध्यम \"%s\" का चयन नहीं किया गया है"
@@ -877,6 +975,11 @@ msgstr "\"%s\" माध्यम को हटाया जा रहा है
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -930,7 +1033,12 @@ msgstr "...पुनःसंरचना प्रक्रिया असफ़
msgid "reconfiguration done"
msgstr "पुनःसंरचना प्रक्रिया सम्पन्न हुई"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "माध्यम \"%s\" का चयन नहीं किया गया है"
@@ -1191,13 +1299,6 @@ msgstr ""
"\n"
"उपयोग विधि:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - यह सहायता संदेश मुद्रित करें\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1228,13 +1329,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - आरपीएम संसाधन के लिए अन्य रूट का उपयोग\n"
-#: ../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"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1600,14 +1694,6 @@ msgstr " --auto - इच्छित पैकेजों में
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - जाँच करें कि सही-सही तरीके से हटाया जा सकता है\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - यद्यपि कुछ पैकेज ना विद्यमान हो, तो भी इनवोकेशन को बल-पूर्वक लागू "
-"करें \n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1706,31 +1792,6 @@ msgstr "(हाँ/ना:y/N)"
msgid "Removal failed"
msgstr "हटाना असफ़ल"
-#: ../urpmi:69
-#, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"यू०आर०पी०एम०आई० संस्मरण %s\n"
-"सर्वाधिकार (C) १९९९-२००४ मैनड्रिव सॉफ़्ट ।\n"
-"यह एक मुक्त सॉफ़्टवेयर है और जी०एन०यू० सामान्य जन अधिकार-पत्र के अन्तर्गत पुनः वितरित "
-"किया जा सकता है।\n"
-"\n"
-"उपयोग विधि:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - निवेदित (या अपडेट किये हुए) पैकेजों की खोज के लिए, सिर्फ़ दिए गए "
-"माध्यम का उपयोग करें ।\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1738,12 +1799,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - प्रणाली को उन्नयन बनाने के लिए, स्वतः पैकेजों का चयन करें\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1857,11 +1912,6 @@ msgstr ""
" --allow-force - उपयोगकर्ता को, पैकेजों को बिना अधिनताओं और अखंडता की जाँच करें,\n"
" संसाधित करने के लिए प्रश्न पूछने की अनुमति प्रदान करें\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - आरपीएम संसाधन के लिए अन्य रूट का उपयोग\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1946,22 +1996,6 @@ msgstr ""
" --bug - एक दोष रिपोर्ट को अगले मान के द्वारा बताई गयी निर्देशिका में\n"
" निर्गम करें\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - संसाधन के पहिले, आर०पी०एम० हस्ताक्षर की जाँच करें\n"
-" (--no-verify-rpm इसे अयोग्य करता है, डिफ़ॉल्ट जाँच के साथ है).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - जाँच करें कि संसाधन सफ़लता-पूर्वक किया जा सकता है\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2281,12 +2315,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "निरस्त"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "यू०आर०पी०एम०आई० को पुनः आरम्भ किया जा रहा है"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "तैयार होने पर इन्टर (Enter) कुंजी को दबायें..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3041,9 +3075,6 @@ msgstr "कोई परिवर्तनलॉग नहीं मिला\n"
#~ msgstr ""
#~ "बेमेल माध्यम \"%s\" को हटानेयोग्य चिह्नित किया गया है परन्तु वास्तव में ऐसा नहीं है"
-#~ msgid "Press Enter when ready..."
-#~ msgstr "तैयार होने पर इन्टर (Enter) कुंजी को दबायें..."
-
#~ msgid " -c - clean headers cache directory.\n"
#~ msgstr " -c - शीर्ष कैश निर्देशिका को स्वच्छ करें\n"
diff --git a/po/hr.po b/po/hr.po
index 47219a7d..119cd3df 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2005-01-04 21:27+CET\n"
"Last-Translator: auto\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -86,7 +86,87 @@ msgstr "_Odustani"
msgid "Choose location to save file"
msgstr "Izaberite datoteku"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq inačica %s\n"
+"Autorska prava (C) 2000, 2001, 2002 Mandriva.\n"
+"Ovo je slobodan software i može biti redistribuiran pod stavkama GNU GPLa.\n"
+"\n"
+"uporaba:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - ispiši ovaj tekst s pomoći.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, fuzzy, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - automatski izaberi pakete za dogradnju sustava.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - prisili pozivanje iako neki paketi ne postoje.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - provjeri rpm potpis prije instalacije\n"
+" (--no-verify-rpm treba biti isključen, uobičajeno je "
+"uključen).\n"
+
+#: ../gurpmi.pm:52 ../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 - koristi samo medije za dogradnju.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, fuzzy, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --wget - koristi wget za dohvaćanje udaljenih datoteka.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - potvrdi da instalacija može biti dostignuta točno.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr " --media - koristi samo medije popisane zarezom.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Naredba nije specificirana"
@@ -242,6 +322,11 @@ msgstr "Instalirano"
msgid "removing %s"
msgstr "Uklanjam %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "restartam urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -394,7 +479,14 @@ msgstr ""
msgid "Copying failed"
msgstr "...kopiranje neuspješno"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "medij \"%s\" nije izabran"
@@ -856,6 +948,11 @@ msgstr "uklanjam medij \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -909,7 +1006,12 @@ msgstr "Postavke meni-a spremljene"
msgid "reconfiguration done"
msgstr "Podešavanje poslužitelja"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medij \"%s\" nije izabran"
@@ -1167,13 +1269,6 @@ msgstr ""
"\n"
"uporaba:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - ispiši ovaj tekst s pomoći.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1203,11 +1298,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --wget - koristi wget za dohvaćanje udaljenih datoteka.\n"
-#: ../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 - koristi samo medije za dogradnju.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, fuzzy, c-format
msgid ""
@@ -1582,12 +1672,6 @@ msgstr "Prikaži automatski odabrane pakete"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - potvrdi da instalacija može biti dostignuta točno.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - prisili pozivanje iako neki paketi ne postoje.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1685,28 +1769,6 @@ msgstr " (d/N) "
msgid "Removal failed"
msgstr "Prijava nije uspjela"
-#: ../urpmi:69
-#, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmq inačica %s\n"
-"Autorska prava (C) 2000, 2001, 2002 Mandriva.\n"
-"Ovo je slobodan software i može biti redistribuiran pod stavkama GNU GPLa.\n"
-"\n"
-"uporaba:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --media - koristi samo medije popisane zarezom.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1714,12 +1776,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, fuzzy, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - automatski izaberi pakete za dogradnju sustava.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1839,11 +1895,6 @@ msgstr ""
"paketa bez\n"
" ovisnosti o provjeri i integritetu.\n"
-#: ../urpmi:110 ../urpmq:68
-#, fuzzy, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --wget - koristi wget za dohvaćanje udaljenih datoteka.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1926,23 +1977,6 @@ msgstr ""
" --bug - ispiši izvješće o grešci u mapu određenu\n"
"sljedećim argumentom.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - provjeri rpm potpis prije instalacije\n"
-" (--no-verify-rpm treba biti isključen, uobičajeno je "
-"uključen).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - potvrdi da instalacija može biti dostignuta točno.\n"
-
#: ../urpmi:135
#, fuzzy, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2247,12 +2281,12 @@ msgstr[2] ""
msgid "Cancel"
msgstr "Odustani"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "restartam urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Pritisnite Enter kada ste gotovi..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -2987,10 +3021,6 @@ msgstr "Nije pronađena ni jedna slika"
#~ 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"
diff --git a/po/hu.po b/po/hu.po
index 282d4977..e114e877 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-03-03 23:02+0100\n"
"Last-Translator: Lónyai Gergely <alephlg@gmail.com>\n"
"Language-Team: Hungarian <aleph@mandriva.org>\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,7 +110,94 @@ msgstr "_Mégsem"
msgid "Choose location to save file"
msgstr "Válasszon helyet a fájlnak"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\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) Mandriva, 1999-2008.\n"
+"Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthető.\n"
+"\n"
+"Használat:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - nem-interaktív mód, a kérdésekre az alapértelmezett\n"
+" válaszok lesznek feltételezve\n"
+
+#: ../gurpmi.pm:48 ../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"
+
+#: ../gurpmi.pm:49 ../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"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - RPM-aláírás ellenőrzése telepítés előtt (kikapcsolás:\n"
+" --no-verify-rpm; alapértelmezés: bekapcsolt állapot)\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../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"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+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"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+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"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Nincs megadva csomag"
@@ -145,8 +228,7 @@ msgstr ""
msgid "Warning"
msgstr "Figyelmeztetés"
-#: ../gurpmi2:114
-#: ../urpmi:626
+#: ../gurpmi2:114 ../urpmi:626
#, c-format
msgid "Ok"
msgstr "OK"
@@ -183,20 +265,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
@@ -211,14 +294,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..."
@@ -228,8 +309,7 @@ msgstr "Előkészítés..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "A(z) '%s' (%s/%s) csomag telepítése..."
-#: ../gurpmi2:264
-#: ../urpmi:622
+#: ../gurpmi2:264 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Kérem helyezze be a(z) \"%s\" nevű adathordozót"
@@ -244,8 +324,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"
@@ -256,9 +335,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:"
@@ -274,12 +351,16 @@ 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"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "az urpmi újraindítása"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -316,8 +397,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"
@@ -352,18 +432,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"
@@ -398,8 +473,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"
@@ -412,7 +486,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
@@ -424,8 +500,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\""
@@ -435,14 +510,19 @@ 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
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "a(z) \"%s\" adatforrás nem elérhető"
@@ -467,9 +547,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\""
@@ -621,8 +699,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
@@ -644,8 +725,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"
@@ -690,8 +770,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:"
@@ -726,9 +805,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"
@@ -763,8 +840,7 @@ 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:259
-#: ../urpm/main_loop.pm:267
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
#, c-format
msgid "Error"
msgstr "Hiba"
@@ -828,7 +904,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
@@ -838,7 +916,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
@@ -848,10 +927,10 @@ msgstr "a(z) \"%s\" néven létező adatforrás elkerülése - kihagyás"
#: ../urpm/media.pm:409
#, c-format
msgid "failed to migrate removable device, ignoring media"
-msgstr "Sikertelen az eltávolítható eszköz csatlakoztatása. Az adatforrás kihagyva..."
+msgstr ""
+"Sikertelen az eltávolítható eszköz csatlakoztatása. Az adatforrás kihagyva..."
-#: ../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\""
@@ -868,8 +947,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
@@ -907,6 +990,11 @@ msgid "adding medium \"%s\""
msgstr "\"%s\" adatforrás hozzáadása"
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "\"%s\" környezeti könyvtár nem létezik"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "úgy tűnik, ez a hely nem tartalmaz disztribúciót"
@@ -963,7 +1051,13 @@ msgstr "...a beállítások módosítása sikertelen"
msgid "reconfiguration done"
msgstr "a beállítások módosítása megtörtént"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+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"
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "a(z) \"%s\" adatforrás naprakész"
@@ -976,17 +1070,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"
@@ -996,8 +1088,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"
@@ -1010,10 +1101,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)"
@@ -1041,15 +1132,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"
@@ -1092,31 +1185,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"
@@ -1181,8 +1265,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"
@@ -1212,8 +1295,7 @@ msgstr "\"%s\" párhuzamossági opció nem használható"
msgid "unable to access medium \"%s\"."
msgstr "a(z) \"%s\" adatforrás nem hozzáférhető"
-#: ../urpm/removable.pm:66
-#: ../urpm/removable.pm:84
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "%s csatolása"
@@ -1223,13 +1305,13 @@ msgstr "%s csatolása"
msgid "unmounting %s"
msgstr "%s leválasztása"
-#: ../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 ""
@@ -1239,385 +1321,296 @@ 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
-#, 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
-#, 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ő"
@@ -1625,26 +1618,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"
@@ -1654,8 +1649,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"
@@ -1715,7 +1709,8 @@ msgstr "%s nem mozgatható ide: %s"
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2008 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 ""
@@ -1728,29 +1723,21 @@ 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"
-
-#: ../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"
+msgstr ""
+" --test - annak ellenőrzése, hogy az eltávolítás végrehajtható-e\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"
@@ -1758,7 +1745,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
@@ -1775,9 +1763,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"
@@ -1802,8 +1788,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"
@@ -1821,7 +1806,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"
@@ -1832,10 +1818,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) "
@@ -1845,45 +1828,20 @@ msgstr " (i/N) "
msgid "Removal failed"
msgstr "Az eltávolítás sikertelen"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\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) Mandriva, 1999-2008.\n"
-"Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthető.\n"
-"\n"
-"Használat:\n"
-
-#: ../urpmi:78
-#, c-format
-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
-#, c-format
-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
@@ -1895,17 +1853,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
@@ -1913,8 +1875,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"
@@ -1930,14 +1891,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
@@ -1952,12 +1916,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
@@ -1967,12 +1933,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
@@ -1981,7 +1951,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
@@ -1989,16 +1960,12 @@ 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
-#, 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"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -2006,7 +1973,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
@@ -2043,9 +2011,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"
@@ -2057,24 +2023,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"
@@ -2092,24 +2054,11 @@ msgstr ""
" --bug - hibajelentés írása a következő argumentumban megadott\n"
" könyvtárba\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - RPM-aláírás ellenőrzése telepítés előtt (kikapcsolás:\n"
-" --no-verify-rpm; alapértelmezés: bekapcsolt állapot)\n"
-
-#: ../urpmi:134
-#, c-format
-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
@@ -2119,13 +2068,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
@@ -2149,7 +2100,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
@@ -2162,8 +2114,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"
@@ -2176,7 +2127,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
@@ -2191,7 +2143,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
@@ -2204,7 +2157,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
@@ -2214,18 +2168,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
@@ -2272,8 +2235,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
@@ -2302,8 +2268,7 @@ msgstr ""
"amelyek régebbiek a telepítetteknél:\n"
"%s"
-#: ../urpmi:508
-#: ../urpmi:524
+#: ../urpmi:508 ../urpmi:524
#, c-format
msgid ""
"\n"
@@ -2312,10 +2277,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) "
@@ -2366,7 +2328,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
@@ -2375,7 +2338,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
@@ -2386,10 +2350,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
@@ -2424,12 +2390,12 @@ msgstr[1] "Kívánja folytatni a(z) %d csomag telepítését?"
msgid "Cancel"
msgstr "Mégsem"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "az urpmi újraindítása"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Amikor elkészült, nyomja le az Enter billentyűt..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2462,7 +2428,8 @@ msgstr ""
" cdrom://<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"
@@ -2472,23 +2439,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"
@@ -2502,10 +2463,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
@@ -2527,17 +2490,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
@@ -2552,10 +2520,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"
@@ -2563,23 +2531,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"
+msgstr ""
+" --raw - az adatforrás felvétele, de a frissítésének mellőzése\n"
-#: ../urpmi.addmedia:80
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:51
+#: ../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"
@@ -2597,7 +2564,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
@@ -2648,7 +2616,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 ""
@@ -2672,7 +2641,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"
@@ -2680,7 +2650,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
@@ -2765,8 +2736,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"
@@ -2813,7 +2783,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
@@ -2846,12 +2818,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
@@ -2873,7 +2849,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
@@ -2883,7 +2860,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
@@ -2914,7 +2893,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 ""
@@ -2926,7 +2906,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"
@@ -2954,7 +2936,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
@@ -2963,17 +2946,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"
@@ -2982,7 +2970,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
@@ -3045,7 +3034,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
@@ -3059,7 +3049,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
@@ -3069,7 +3060,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
@@ -3084,32 +3076,41 @@ 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
@@ -3124,22 +3125,32 @@ msgstr "használja a -l opciót a fállistához"
#: ../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
@@ -3148,19 +3159,26 @@ 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 "
@@ -3169,19 +3187,17 @@ msgstr "Változási lista nem található\n"
#~ "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)"
@@ -3189,95 +3205,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 eba0e055..aba88a26 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +109,94 @@ msgstr "_Batal"
msgid "Choose location to save file"
msgstr "Pilih lokasi penyimpanan file"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versi %s\n"
+"Hak cipta (C) 1999-2008 Mandriva.\n"
+"Ini adalah software bebas dan boleh didistribusikan ulang di bawah syarat "
+"GPL GNU.\n"
+"\n"
+"pemakaian:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 pesan bantuan ini.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - mode non-interaktif, mengasumsikan jawaban default pada "
+"semua pertanyaan.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - otomatis menyeleksi paket untuk upgrade sistem.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - paksa instal meski beberapa paket tidak ada.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - verifikasi tandatangan rpm sebelum installasi\n"
+" (--no-verify-rpm menonaktifkannya, defaultnya aktif).\n"
+
+#: ../gurpmi.pm:52 ../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 - hanya pakai hanya media yang diberikan, dipisahkan koma.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - gunakan root lain untuk installasi rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - hanya verifikasi apakah installasi dapat dilaksanakan "
+"dengan benar.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - hanya gunakan media yang diberikan untuk mencari paket "
+"yang dicari.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Tidak ada paket yang ditentukan"
@@ -267,6 +354,11 @@ msgstr "Instalasi selesai"
msgid "removing %s"
msgstr "menghapus %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "jalankan ulang urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -417,7 +509,14 @@ msgstr "Terlalu banyak argumen\n"
msgid "Copying failed"
msgstr "Penyalinan gagal"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "media \"%s\" tidak tersedia"
@@ -878,6 +977,11 @@ msgid "adding medium \"%s\""
msgstr "menambahkan media \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Direktori lingkungan %s tidak ada"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "lokasi ini tampaknya tidak mengandung sembarang distribusi"
@@ -934,7 +1038,13 @@ msgstr "...konfigurasi ulang gagal"
msgid "reconfiguration done"
msgstr "konfigurasi ulang selesai"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+"Kesalahan dalam menghasilkan nama file : ketergantungan %d tidak ditemukan"
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "media \"%s\" sudah terbaru"
@@ -1193,13 +1303,6 @@ msgstr ""
"\n"
"pemakaian:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - cetak pesan bantuan ini.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1234,12 +1337,6 @@ msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
" --urpmi-root - gunakan root lain untuk installasi db urpmi & rpm.\n"
-#: ../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 - hanya pakai hanya media yang diberikan, dipisahkan koma.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1611,12 +1708,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - pastikan apakah penghapusan bisa dilakukan dengan benar.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - paksa instal meski beberapa paket tidak ada.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1712,31 +1803,6 @@ msgstr " (y/T) "
msgid "Removal failed"
msgstr "Penghapusan gagal"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versi %s\n"
-"Hak cipta (C) 1999-2008 Mandriva.\n"
-"Ini adalah software bebas dan boleh didistribusikan ulang di bawah syarat "
-"GPL GNU.\n"
-"\n"
-"pemakaian:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - hanya gunakan media yang diberikan untuk mencari paket "
-"yang dicari.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1746,12 +1812,6 @@ msgstr ""
" --auto - mode non-interaktif, mengasumsikan jawaban default pada "
"semua pertanyaan.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - otomatis menyeleksi paket untuk upgrade sistem.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1866,11 +1926,6 @@ msgstr ""
" --allow-force - izinkan meminta user menginstal paket tanpa\n"
" menguji ketergantungan dan integritas.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - gunakan root lain untuk installasi rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1954,24 +2009,6 @@ msgstr ""
" --bug - keluarkan laporan bug ke direktori yang ditentukan oleh\n"
" arg. berikut.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - verifikasi tandatangan rpm sebelum installasi\n"
-" (--no-verify-rpm menonaktifkannya, defaultnya aktif).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - hanya verifikasi apakah installasi dapat dilaksanakan "
-"dengan benar.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2298,12 +2335,12 @@ msgstr[1] "Lanjutkan dengan installasi paket-paket %d?"
msgid "Cancel"
msgstr "Batal"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "jalankan ulang urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Tekan [Enter] jika siap.."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3063,20 +3100,12 @@ msgstr "Changelog tidak ditemukan\n"
#~ 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"
-#~ msgid "Error generating names file: dependency %d not found"
-#~ msgstr ""
-#~ "Kesalahan dalam menghasilkan nama file : ketergantungan %d tidak "
-#~ "ditemukan"
-
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr ""
#~ "Kesalahan dalam menghasilkan nama file : Tidak bisa menulis ke file (%s)"
diff --git a/po/is.po b/po/is.po
index 0e60004a..1c64063b 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +105,91 @@ msgstr "Hætta _við"
msgid "Choose location to save file"
msgstr "Veldu stað til að vista skrá"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi útgáfa %s\n"
+"Höfundaréttur © 1999-2008 Mandriva.\n"
+"Þetta er frjáls hugbúnaður og má dreifa samkvæmt skilmálum GNU GPL.\n"
+"\n"
+"notkun:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - prenta þetta.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - ekki gagnvirkur hamur, gera ráðfyrir sjálfgefnum svörum "
+"við spurningum.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - velja sjálfkrafa pakka til að uppfæra kerfið.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - þvinga uppsetningu þó sumir pakkar séu ekki til.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - staðfesta rpm undirskriftir áður en pakkar eru uppsettir\n"
+" (--no-verify-rpm aftengir, sjálfgefið er að athuga "
+"pakka).\n"
+
+#: ../gurpmi.pm:52 ../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 - nota aðeins uppgefna miðla, aðskildir með kommum.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - Nota aðra rót fyrir rpm uppsetningu.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - aðeins athuga hvort uppsetning muni takast.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - nota aðeins uppgefin miðil til að leita að umbeðnum "
+"pökkum.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Engir pakkar tilgreindir"
@@ -263,6 +347,11 @@ msgstr "Innsetningu lokið"
msgid "removing %s"
msgstr "fjarlægi %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "endurræsi urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -413,7 +502,14 @@ msgstr "Of mörg viðföng\n"
msgid "Copying failed"
msgstr "Afritun brást"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "miðill \"%s\" er ekki tiltækur"
@@ -876,6 +972,11 @@ msgid "adding medium \"%s\""
msgstr "bæti við miðli \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Umhverfismappa %s er ekki til"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "þessi staðsetning virðist ekki innihalda neina dreifingu"
@@ -930,7 +1031,12 @@ msgstr "...endurstilling mistókst"
msgid "reconfiguration done"
msgstr "endurstillingu lokið"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "Villa við myndun nafnaskrár: er háð %d sem finnst ekki"
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "miðill \"%s\" er uppfærð"
@@ -1188,13 +1294,6 @@ msgstr ""
"\n"
"notkun: urpmf [valkostir] mynstur\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - prenta þetta.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1228,11 +1327,6 @@ msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
" --urpmi-root - nota aðra rót fyrir urpmi gagnagrunn og rpm uppsetningu.\n"
-#: ../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 - nota aðeins uppgefna miðla, aðskildir með kommum.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1598,12 +1692,6 @@ msgstr " --auto - velja sjálfvirkt pakka í vali.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - staðfesta að hægt sé að fjarlægja umbeðna pakka.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - þvinga uppsetningu þó sumir pakkar séu ekki til.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1700,30 +1788,6 @@ msgstr " (J/n) "
msgid "Removal failed"
msgstr "Mistókst að fjarlægja"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi útgáfa %s\n"
-"Höfundaréttur © 1999-2008 Mandriva.\n"
-"Þetta er frjáls hugbúnaður og má dreifa samkvæmt skilmálum GNU GPL.\n"
-"\n"
-"notkun:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - nota aðeins uppgefin miðil til að leita að umbeðnum "
-"pökkum.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1733,12 +1797,6 @@ msgstr ""
" --auto - ekki gagnvirkur hamur, gera ráðfyrir sjálfgefnum svörum "
"við spurningum.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - velja sjálfkrafa pakka til að uppfæra kerfið.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1854,11 +1912,6 @@ msgstr ""
" --allow-force - leyfa notanda að setja upp pakka án þess að athuga\n"
" tengda pakka eða staðfesta uppruna.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - Nota aðra rót fyrir rpm uppsetningu.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1942,23 +1995,6 @@ msgstr ""
" --bug - skrifa út villutilkynningu í möppuna sem tilgreind er\n"
" í næsta viðfangi.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - staðfesta rpm undirskriftir áður en pakkar eru uppsettir\n"
-" (--no-verify-rpm aftengir, sjálfgefið er að athuga "
-"pakka).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - aðeins athuga hvort uppsetning muni takast.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2286,12 +2322,12 @@ msgstr[1] "Halda áfram með uppsetningu á %d pökkum?"
msgid "Cancel"
msgstr "Hætta við"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "endurræsi urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Sláðu á ENTER þegar tilbúinn..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3039,18 +3075,12 @@ msgstr "Enginn breytilisti fannst\n"
#~ 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"
-#~ msgid "Error generating names file: dependency %d not found"
-#~ msgstr "Villa við myndun nafnaskrár: er háð %d sem finnst ekki"
-
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr "Villa við myndun nafnaskrár: get ekki skrifað í skrá (%s)"
diff --git a/po/it.po b/po/it.po
index d1c2f25a..17077f57 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-03-07 23:01+0100\n"
"Last-Translator: Andrea Celli <andrea.celli@libero.it>\n"
"Language-Team: Italian <timl@freelists.org>\n"
@@ -112,7 +112,101 @@ msgstr "_Cancella"
msgid "Choose location to save file"
msgstr "Scegli dove salvare i file"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versione %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Questo è software libero e può essere ridistribuito secondo i termini della "
+"licenza GNU GPL.\n"
+"\n"
+"uso:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - stampa questo messaggio di aiuto.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+"--auto - modalità automatica, prevede la risposta di default \" a "
+"tutte le domande\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - seleziona automaticamente i pacchetti per aggiornare il "
+"sistema.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - forza l'esecuzione anche se alcuni pacchetti non "
+"esistono.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - verifica la firma del pacchetto prima dell'installazione\n"
+" (--no-verify-rpm la disabilita, solitamente è "
+"abilitata).\n"
+
+#: ../gurpmi.pm:52 ../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 solo i supporti nella lista, separati da virgole.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+" --root - cambia la directory di root per installare i file rpm "
+"\"chrooted\".\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - verifica che l'installazione possa avvenire "
+"correttamente.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - usa solo i supporti indicati per cercare i "
+"pacchetti richiesti\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Nessun pacchetto selezionato"
@@ -186,12 +280,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 "Per soddisfare le dipendenze, sarà installato il seguente pacchetto:"
#: ../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 "Per soddisfare le dipendenze, saranno installati i seguenti pacchetti:"
#: ../gurpmi2:218
@@ -268,6 +364,11 @@ msgstr "Installazione completata"
msgid "removing %s"
msgstr "rimozione di %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "Riavvio di urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -418,7 +519,14 @@ msgstr "Troppi argomenti\n"
msgid "Copying failed"
msgstr "Copia fallita"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "il supporto \"%s\" non è disponibile"
@@ -583,7 +691,8 @@ msgstr "URL malformata : [%s]"
#: ../urpm/get_pkgs.pm:149
#, c-format
msgid "sorry, you can't use --install-src to install remote .src.rpm files"
-msgstr "Purtroppo non puoi usare --install-src per installare file .src.rpm remoti"
+msgstr ""
+"Purtroppo non puoi usare --install-src per installare file .src.rpm remoti"
#: ../urpm/get_pkgs.pm:156
#, c-format
@@ -597,7 +706,8 @@ msgstr "[rimpacchetto]"
#: ../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 ""
"creata transazione per installare su %s (rimuove=%d, installa=%d, aggiorna=%"
"d)"
@@ -885,6 +995,11 @@ msgid "adding medium \"%s\""
msgstr "viene aggiunto il supporto \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "La directory %s, specificata nelle variabili d'ambiente, non esiste"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "questo indirizzo non sembra contenere alcuna distribuzione"
@@ -897,7 +1012,8 @@ msgstr "impossibile esaminare media.cfg"
#: ../urpm/media.pm:772
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "impossibile accedere al supporto di installazione (manca il file media.cfg)"
+msgstr ""
+"impossibile accedere al supporto di installazione (manca il file media.cfg)"
#: ../urpm/media.pm:790
#, c-format
@@ -939,7 +1055,12 @@ msgstr "...riconfigurazione fallita"
msgid "reconfiguration done"
msgstr "riconfigurazione eseguita"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "il supporto \"%s\" è aggiornato"
@@ -1198,13 +1319,6 @@ msgstr ""
"\n"
"uso:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - stampa questo messaggio di aiuto.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1213,7 +1327,8 @@ msgstr " --version - stampa la versione di questo tool.\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 - usa un ambiente specifico (tipicamente un bug report).\n"
+msgstr ""
+" --env - usa un ambiente specifico (tipicamente un bug report).\n"
#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:76 ../urpmq:49
#, c-format
@@ -1222,7 +1337,8 @@ msgstr " --excludemedia - non usa i supporti elencati, separati da virgole.\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 - non confronta i pattern, usa l'argomento come stringa "
"letterale.\n"
@@ -1236,14 +1352,10 @@ msgstr ""
" --root - cambia la directory radice per installare i file rpm e "
"per il db di urpmi.\n"
-#: ../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 solo i supporti nella lista, separati da virgole.\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 - ordina i supporti in base alle sottostringhe separate da "
"virgole\n"
@@ -1256,7 +1368,8 @@ msgstr " --use-distrib - utilizza questo percorso per accedere al supporto\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 - utilizza la synthesis specificata invece del db urpmi.\n"
+msgstr ""
+" --synthesis - utilizza la synthesis specificata invece del db urpmi.\n"
#: ../urpm/search.pm:45 ../urpmf:45
#, c-format
@@ -1283,7 +1396,8 @@ msgstr ""
#: ../urpm/search.pm:49 ../urpmf:49
#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -I - confronta i pattern distinguendo maiuscole/minuscole .\n"
+msgstr ""
+" -I - confronta i pattern distinguendo maiuscole/minuscole .\n"
#: ../urpm/search.pm:50 ../urpmf:50
#, c-format
@@ -1291,15 +1405,15 @@ msgid " -F<str> - change field separator (defaults to ':').\n"
msgstr "-F<str> - cambia il separatore di campo (default ':').\n"
#: ../urpm/search.pm:51 ../urpmf:51
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
msgid "Pattern expressions:\n"
msgstr "Pattern expressions:\n"
#: ../urpm/search.pm:52 ../urpmf:52
#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
-msgstr "-text - il testo è usato come regexp, se non viene specificato -l.\n"
+msgstr ""
+"-text - il testo è usato come regexp, se non viene specificato -l.\n"
#: ../urpm/search.pm:53 ../urpmf:53
#, c-format
@@ -1464,7 +1578,8 @@ msgstr " -m - il supporto dov'è stato trovato il pacchetto\n"
#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:94
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - stampa versione, release e architettura con il nome.\n"
+msgstr ""
+" -f - stampa versione, release e architettura con il nome.\n"
#: ../urpm/search.pm:197 ../urpmf:197
#, c-format
@@ -1494,14 +1609,16 @@ msgstr "manca xml-info per il supporto \"%s\""
#: ../urpm/select.pm:21
#, c-format
msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi è stato riavviato, ma l'elenco dei pacchetti prioritari non è cambiato"
+msgstr ""
+"urpmi è stato riavviato, ma l'elenco dei pacchetti prioritari non è cambiato"
#: ../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 è stato riavviato. L'elenco dei pacchetti prioritari è cambiato da %s a "
-"%s"
+"urpmi è stato riavviato. L'elenco dei pacchetti prioritari è cambiato da %s "
+"a %s"
#: ../urpm/select.pm:184
#, c-format
@@ -1598,19 +1715,14 @@ msgstr ""
#: ../urpme:46
#, c-format
msgid " --auto - automatically select a package in choices.\n"
-msgstr " --auto - include automaticamente un pacchetto nelle scelte.\n"
+msgstr ""
+" --auto - include automaticamente un pacchetto nelle scelte.\n"
#: ../urpme:47
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - verifica se la rimozione può avvenire correttamente.\n"
-
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
msgstr ""
-" --force - forza l'esecuzione anche se alcuni pacchetti non "
-"esistono.\n"
+" --test - verifica se la rimozione può avvenire correttamente.\n"
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
@@ -1688,7 +1800,8 @@ msgstr "Controllo per la rimozione dei seguenti pacchetti"
#: ../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] "Per soddisfare le dipendenze, sarà rimosso il seguente pacchetto"
msgstr[1] "Per soddisfare le dipendenze, saranno rimossi i seguenti pacchetti"
@@ -1709,30 +1822,6 @@ msgstr " (s/N) "
msgid "Removal failed"
msgstr "Rimozione fallita"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versione %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Questo è software libero e può essere ridistribuito secondo i termini della "
-"licenza GNU GPL.\n"
-"\n"
-"uso:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - usa solo i supporti indicati per cercare i "
-"pacchetti richiesti\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1742,13 +1831,6 @@ msgstr ""
"--auto - modalità automatica, prevede la risposta di default \" a "
"tutte le domande\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - seleziona automaticamente i pacchetti per aggiornare il "
-"sistema.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1769,7 +1851,9 @@ msgstr " --force-key - forza l'aggiornamento della chiave gpg.\n"
#: ../urpmi:86 ../urpmq:53
#, c-format
msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
-msgstr " --no-suggests - non seleziona automaticamente i pacchetti \"suggeriti\"\n"
+msgstr ""
+" --no-suggests - non seleziona automaticamente i pacchetti \"suggeriti"
+"\"\n"
#: ../urpmi:87
#, c-format
@@ -1820,12 +1904,15 @@ msgstr " --fuzzy, -y - impone una ricerca fuzzy.\n"
#: ../urpmi:98
#, c-format
msgid " --buildrequires - install the buildrequires of the packages\n"
-msgstr " --buildrequires - installa quanto richiesto (buildrequires) per il pacchetto\n"
+msgstr ""
+" --buildrequires - installa quanto richiesto (buildrequires) per il "
+"pacchetto\n"
#: ../urpmi:99
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
-msgstr " --install-src - installa solo il pacchetto dei sorgenti (non i binari).\n"
+msgstr ""
+" --install-src - installa solo il pacchetto dei sorgenti (non i binari).\n"
#: ../urpmi:100
#, c-format
@@ -1846,8 +1933,10 @@ msgstr " --update - aggiorna solo il DB degli rpm, non il filesystem.\n"
#: ../urpmi:103
#, c-format
-msgid " --replacepkgs - force installing packages which are already installed.\n"
-msgstr " --replacepkgs - forza l'installazione dei pacchetti già installati.\n"
+msgid ""
+" --replacepkgs - force installing packages which are already installed.\n"
+msgstr ""
+" --replacepkgs - forza l'installazione dei pacchetti già installati.\n"
#: ../urpmi:105
#, c-format
@@ -1867,13 +1956,6 @@ msgstr ""
" --allow-force - permette di chiedere all'utente se desidera installare\n"
" dei pacchetti senza controllare dipendenze e integrità.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-" --root - cambia la directory di root per installare i file rpm "
-"\"chrooted\".\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1962,25 +2044,6 @@ msgstr ""
" --bug - produce un bug report nella directory indicata con\n"
" l'argomento successivo.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - verifica la firma del pacchetto prima dell'installazione\n"
-" (--no-verify-rpm la disabilita, solitamente è "
-"abilitata).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - verifica che l'installazione possa avvenire "
-"correttamente.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -1994,12 +2057,14 @@ msgstr " --excludedocs - esclude i file di documentazione.\n"
#: ../urpmi:137
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize -non verifica lo spazio disponibile prima dell'installazione\n"
+msgstr ""
+" --ignoresize -non verifica lo spazio disponibile prima dell'installazione\n"
#: ../urpmi:138
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr "--ignore-arch...- permette di installare pacchetti di altre architetture.\n"
+msgstr ""
+"--ignore-arch...- permette di installare pacchetti di altre architetture.\n"
#: ../urpmi:139
#, c-format
@@ -2033,12 +2098,14 @@ msgstr "--nolock - non bloccare il db degli rpm\n"
#: ../urpmi:146
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - aggiorna solo i pacchetti della stessa architettura.\n"
+msgstr ""
+" --strict-arch - aggiorna solo i pacchetti della stessa architettura.\n"
#: ../urpmi:147 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
-msgstr " -a - seleziona tutte le corrispondenze da riga di comando.\n"
+msgstr ""
+" -a - seleziona tutte le corrispondenze da riga di comando.\n"
#: ../urpmi:148
#, c-format
@@ -2048,7 +2115,8 @@ msgstr " -p - abilita la ricerca tra i provides del pacchetto.\n"
#: ../urpmi:149
#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -P - non cercare tra i provides per trovare il pacchetto.\n"
+msgstr ""
+" -P - non cercare tra i provides per trovare il pacchetto.\n"
#: ../urpmi:150
#, c-format
@@ -2089,7 +2157,8 @@ msgstr "Non puoi installare rpm binari rpm quando viene usato --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 "devi utilizzare --buildrequires (predefinito) o --install-src"
#: ../urpmi:241
@@ -2154,7 +2223,8 @@ msgstr "%s (da installare)"
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
-msgstr "Per soddisfare le dipendenze di \"%s\" serve uno dei seguenti pacchetti:"
+msgstr ""
+"Per soddisfare le dipendenze di \"%s\" serve uno dei seguenti pacchetti:"
#: ../urpmi:458
#, c-format
@@ -2267,7 +2337,8 @@ msgid ""
"dependencies:\n"
"%s\n"
msgstr ""
-"Devi prima lanciare urpmi con --buildrequires per installare le seguenti dipendenze:\n"
+"Devi prima lanciare urpmi con --buildrequires per installare le seguenti "
+"dipendenze:\n"
"%s\n"
#: ../urpmi:595
@@ -2302,12 +2373,12 @@ msgstr[1] "Procedo con l'installazione di %d pacchetti?"
msgid "Cancel"
msgstr "Annulla"
-#: ../urpmi:665
+#: ../urpmi:635
#, c-format
-msgid "restarting urpmi"
-msgstr "Riavvio di urpmi"
+msgid "Press Enter when mounted..."
+msgstr ""
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2377,9 +2448,10 @@ msgid ""
" one of: never, on-demand, update-only, always. cf urpmi."
"cfg(5)\n"
msgstr ""
-" --xml-info - segui una politica assegnata per scaricare i file xml-info\n"
-" scelta tra: never, on-demand, update-only, always. cf urpmi."
-"cfg(5)\n"
+" --xml-info - segui una politica assegnata per scaricare i file xml-"
+"info\n"
+" scelta tra: never, on-demand, update-only, always. cf "
+"urpmi.cfg(5)\n"
#: ../urpmi.addmedia:66
#, c-format
@@ -2413,7 +2485,8 @@ msgstr "--interactive - con --distrib, chiede conferma per ogni supporto\n"
#: ../urpmi.addmedia:73
#, c-format
msgid " --all-media - with --distrib, add every listed media\n"
-msgstr " --all-media - with --distrib, aggiunge tutti supporti disponibili.\n"
+msgstr ""
+" --all-media - with --distrib, aggiunge tutti supporti disponibili.\n"
#: ../urpmi.addmedia:74
#, c-format
@@ -2427,7 +2500,8 @@ msgstr ""
#: ../urpmi.addmedia:76
#, c-format
msgid " --virtual - create virtual media wich are always up-to-date.\n"
-msgstr " --virtual - crea supporti virtuali che sono sempre aggiornati.\n"
+msgstr ""
+" --virtual - crea supporti virtuali che sono sempre aggiornati.\n"
#: ../urpmi.addmedia:77 ../urpmi.update:42
#, c-format
@@ -2437,12 +2511,14 @@ msgstr " --no-md5sum - disabilita il controllo MD5SUM sui file.\n"
#: ../urpmi.addmedia:78
#, c-format
msgid " --nopubkey - don't import pubkey of added media\n"
-msgstr "--nopubkey - non importa la chiave pubblica dei supporti aggiunti\n"
+msgstr ""
+"--nopubkey - non importa la chiave pubblica dei supporti aggiunti\n"
#: ../urpmi.addmedia:79
#, c-format
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"
+msgstr ""
+"--raw - aggiunge il supporto alla configurazione ma non lo aggiorna.\n"
#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
@@ -2544,7 +2620,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 - elenca le transizioni dalla data/durata specificata\n"
#: ../urpmi.recover:38
@@ -2720,12 +2797,14 @@ msgstr " --ignore - non aggiornare, segna il supporto come ignorato.\n"
#: ../urpmi.update:45
#, c-format
msgid " --no-ignore - don't update, mark the media as enabled.\n"
-msgstr " --no-ignore - non aggiornare, segna il supporto come disponibile.\n"
+msgstr ""
+" --no-ignore - non aggiornare, segna il supporto come disponibile.\n"
#: ../urpmi.update:47
#, c-format
msgid " --probe-rpms - do not use synthesis, use rpm files directly\n"
-msgstr " --probe-rpms - usa direttamente i file rpm, invece di synthesis\n"
+msgstr ""
+" --probe-rpms - usa direttamente i file rpm, invece di synthesis\n"
#: ../urpmi.update:48
#, c-format
@@ -2825,7 +2904,8 @@ msgstr " --list-url - elenca i supporti disponibili e la loro url.\n"
#: ../urpmq:60
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - elenca i nodi disponibili quando si utilizza --parallel.\n"
+msgstr ""
+" --list-nodes - elenca i nodi disponibili quando si utilizza --parallel.\n"
#: ../urpmq:61
#, c-format
@@ -2834,7 +2914,8 @@ msgstr " --list-aliases - elenca gli alias paralleli disponibili.\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 - mostra la configurazione nella forma usata da urpmi."
"addmedia\n"
@@ -2848,7 +2929,8 @@ msgstr ""
#: ../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 - elenca tutti i pacchetti sorgenti prima del download "
"(solo root).\n"
@@ -2856,7 +2938,8 @@ msgstr ""
#: ../urpmq:66
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - permette di cercare rpm per un'altra architettura.\n"
+msgstr ""
+" --ignorearch - permette di cercare rpm per un'altra architettura.\n"
#: ../urpmq:70
#, c-format
@@ -2989,7 +3072,8 @@ msgstr " -Y - come -y, ma non distingue maiuscole da minuscole.\n"
#: ../urpmq:104
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " i nomi o i file rpm passati da riga di comando vengono interrogati.\n"
+msgstr ""
+" i nomi o i file rpm passati da riga di comando vengono interrogati.\n"
#: ../urpmq:180
#, c-format
@@ -3012,19 +3096,21 @@ msgstr ""
#, c-format
msgid "no xml info for medium \"%s\", only partial result for packages %s"
msgstr ""
-"manca xml-info per il supporto \"%s\", solo risultati parziali per i pacchetti "
-"%s"
+"manca xml-info per il supporto \"%s\", solo risultati parziali per i "
+"pacchetti %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 ""
"manca xml-info per il supporto \"%s\", impossibile dare risultati per il "
"pacchetto %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 ""
"manca xml-info per il supporto \"%s\", impossibile dare risultati per i "
"pacchetti %s"
@@ -3033,4 +3119,3 @@ msgstr ""
#, c-format
msgid "No changelog found\n"
msgstr "Nessun changelog trovato\n"
-
diff --git a/po/ja.po b/po/ja.po
index c84aa60a..2e720e3e 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-03-04 21+0900\n"
"Last-Translator: Yukiko Bando<ybando@k6.dion.ne.jp>\n"
"Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -108,7 +108,87 @@ msgstr "キャンセル(_C)"
msgid "Choose location to save file"
msgstr "ファイルを保存する場所を選んでください"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"これはフリーソフトウェアであり、GNU GPL の条件のもとで再配布できます。\n"
+"\n"
+"使い方:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr " --auto\t - 非対話モード、質問に対する答えはデフォルトとみなす\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - 自動的にパッケージを選択してシステムを更新\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - 足りないパッケージがあっても強制的に実行する\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - インストールする前に RPM の署名を確認する\n"
+" (デフォルトで有効。--no-verify-rpm で無効)\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - RPM のインストールに他のルートを使う\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - 正しくインストールされるかどうかテストする\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - 指定したメディアのみを要求したパッケージの検索に使う\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "パッケージが指定されていません"
@@ -265,6 +345,11 @@ msgstr "インストールが完了しました"
msgid "removing %s"
msgstr "%s を削除"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "urpmi を再スタートします"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -416,7 +501,14 @@ msgstr "引数が多すぎます\n"
msgid "Copying failed"
msgstr "コピーに失敗"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "メディア %s は利用できません"
@@ -880,6 +972,11 @@ msgid "adding medium \"%s\""
msgstr "メディア %s を追加"
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "環境ディレクトリ %s が存在しません"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "この場所にはディストリビューションが含まれていないようです"
@@ -936,7 +1033,12 @@ msgstr "...再設定に失敗"
msgid "reconfiguration done"
msgstr "再設定完了"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "名前ファイルの生成エラー: 依存 %d が見つかりません"
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "メディア %s は最新です"
@@ -1194,13 +1296,6 @@ msgstr ""
"\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - このヘルプを表示\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1229,11 +1324,6 @@ msgstr " --literal, -l - パターンで検索せずに引数を普通の文
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --urpmi-root - urpmi db と RPM のインストールに他のルートを使う\n"
-#: ../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"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1594,12 +1684,6 @@ msgstr " --auto - 複数の選択肢から自動的にパッケージ
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - 問題なく削除できるかどうかテストする\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - 足りないパッケージがあっても強制的に実行する\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1693,29 +1777,6 @@ msgstr " (y/N)[デフォルトはN] "
msgid "Removal failed"
msgstr "削除に失敗"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"これはフリーソフトウェアであり、GNU GPL の条件のもとで再配布できます。\n"
-"\n"
-"使い方:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - 指定したメディアのみを要求したパッケージの検索に使う\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1723,12 +1784,6 @@ msgid ""
"questions.\n"
msgstr " --auto\t - 非対話モード、質問に対する答えはデフォルトとみなす\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - 自動的にパッケージを選択してシステムを更新\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1841,11 +1896,6 @@ msgstr ""
" --allow-force - 依存関係に問題が発生したときに、自動的に終了せずに\n"
" --force でインストールするかどうか質問する\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - RPM のインストールに他のルートを使う\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1929,22 +1979,6 @@ msgid ""
" next arg.\n"
msgstr " --bug - 指定したディレクトリにバグレポートを出力\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - インストールする前に RPM の署名を確認する\n"
-" (デフォルトで有効。--no-verify-rpm で無効)\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - 正しくインストールされるかどうかテストする\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2268,12 +2302,12 @@ msgstr[0] "%d 個のパッケージのインストールを開始しますか?
msgid "Cancel"
msgstr "キャンセル"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "urpmi を再スタートします"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "準備ができたら Enter を押してください"
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -3026,18 +3060,12 @@ msgstr "変更ログはありません\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)"
diff --git a/po/ka.po b/po/ka.po
index e29bd032..6a51593c 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +87,85 @@ msgstr "_გაუქმება"
msgid "Choose location to save file"
msgstr ""
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"mdkupdate ვერსია %s\n"
+"საავტორო უფლებები (C) %s Mandriva.\n"
+"პროგრამა უფასო გახლავთ და ნებადართულია მისი GNU GPL ლიცენზიის პირობების "
+"თანახმად გავრცელება.\n"
+"\n"
+"გამოყენება:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
+#, c-format
+msgid " --media - use only the given media, separated by comma.\n"
+msgstr ""
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "ბრძანება არ იქნა მითითებული"
@@ -235,6 +313,11 @@ msgstr "ინსტალაცია ჩაიშალა"
msgid "removing %s"
msgstr "მომხმარებლის წაშლა : %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr ""
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -385,7 +468,14 @@ msgstr ""
msgid "Copying failed"
msgstr "შესვლა ვერ განხორციელდა"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "მედიუმი \"%s\" უკვე არსებობს"
@@ -848,6 +938,11 @@ msgstr "ვაგდებ მედიას \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -901,7 +996,12 @@ msgstr "მენიუს კონფიგურაცია დამახ
msgid "reconfiguration done"
msgstr "სერვერის კონფიგურაცია"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "მედიუმი \"%s\" უკვე არსებობს"
@@ -1160,13 +1260,6 @@ msgstr ""
"\n"
"გამოყენება:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - აჩვენე ეს დამხმარე ტექსტი.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1195,11 +1288,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
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 ""
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1563,12 +1651,6 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1661,29 +1743,6 @@ msgstr " (ხ/ა) [ხ] "
msgid "Removal failed"
msgstr "შესვლა ვერ განხორციელდა"
-#: ../urpmi:69
-#, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdkupdate ვერსია %s\n"
-"საავტორო უფლებები (C) %s Mandriva.\n"
-"პროგრამა უფასო გახლავთ და ნებადართულია მისი GNU GPL ლიცენზიის პირობების "
-"თანახმად გავრცელება.\n"
-"\n"
-"გამოყენება:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1691,12 +1750,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1799,11 +1852,6 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1876,20 +1924,6 @@ msgid ""
" next arg.\n"
msgstr ""
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2176,12 +2210,12 @@ msgstr[0] ""
msgid "Cancel"
msgstr "გამოქცევა"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr ""
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2869,10 +2903,6 @@ msgstr "სურათები ვერ ვიპოვე"
#~ msgstr "ვერ ვიპოვე პირველი საინსტალაციო მედიუმი"
#, fuzzy
-#~ msgid "Press Enter when ready..."
-#~ msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
-
-#, fuzzy
#~ msgid "virtual medium needs to be local"
#~ msgstr ""
#~ "მედიუმი \"%s\" ცდილობს გამოიყენოს უკვე გამოყენებული list. შედეგად უარი "
diff --git a/po/ko.po b/po/ko.po
index 2032d295..40e86137 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +103,84 @@ msgstr "취소 (_C)"
msgid "Choose location to save file"
msgstr "파일 선택"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi 버전 %s\n"
+"저작권(C) 1999-2008 Mandriva.\n"
+"공개 소프트웨어이며, GNU GPL 조건하에서 재배포될 수 있습니다.\n"
+"\n"
+"사용법:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - 패키지가 존재하지 않더라도 강제로 시도\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
+#, c-format
+msgid " --media - use only the given media, separated by comma.\n"
+msgstr ""
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "선택된 패키지 목록 저장"
@@ -259,6 +336,11 @@ msgstr "설치 완료"
msgid "removing %s"
msgstr "%s 제거 중"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr ""
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -411,7 +493,14 @@ msgstr "너무 많은 인수.\n"
msgid "Copying failed"
msgstr "로그인에 실패했습니다"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "매체 [%s]는 사용할 수 없습니다.."
@@ -872,6 +961,11 @@ msgid "adding medium \"%s\""
msgstr "%s 제거 중"
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "chroot 디렉토리가 존재하지 않습니다."
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "이 위치는 어느 제품에서 포함되어있지 않는 듯 합니다."
@@ -926,7 +1020,12 @@ msgstr "..재설정 실패."
msgid "reconfiguration done"
msgstr "재설정 완료"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "파일 이름 생성중 오류: %d 의존성을 찾을수 없습니다."
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "매체 [%s]는 최신의 상태입니다.."
@@ -1184,13 +1283,6 @@ msgstr ""
"\n"
"사용법: urpmf [options] pattern-expression\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - 이 도움말 출력.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1220,11 +1312,6 @@ msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
" --urpmi-root - urpmi 데이터베이스 및 rpm 설치를 위해 다른 root사용\n"
-#: ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
-#, c-format
-msgid " --media - use only the given media, separated by comma.\n"
-msgstr ""
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1583,12 +1670,6 @@ msgstr " --auto - 자동으로 선택된 팩키지들 보이기"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - 만약 제거가 정확하게 이루어질수 있다면 확인.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - 패키지가 존재하지 않더라도 강제로 시도\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1684,28 +1765,6 @@ msgstr " (Y/n) "
msgid "Removal failed"
msgstr "제거 실패"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi 버전 %s\n"
-"저작권(C) 1999-2008 Mandriva.\n"
-"공개 소프트웨어이며, GNU GPL 조건하에서 재배포될 수 있습니다.\n"
-"\n"
-"사용법:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1713,12 +1772,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1821,11 +1874,6 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1898,20 +1946,6 @@ msgid ""
" next arg.\n"
msgstr ""
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2209,12 +2243,12 @@ msgstr[0] ""
msgid "Cancel"
msgstr "취소"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr ""
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "다 되었으면 ENTER키를 누르세요..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -2944,10 +2978,6 @@ msgstr "하드 디스크를 찾을 수 없습니다."
#~ msgstr "일치되지 않는 매체 \"%s\" 는 제거할 수 있지만 아닐 수도 있습니다."
#, fuzzy
-#~ msgid "Press Enter when ready..."
-#~ msgstr "다 되었으면 ENTER키를 누르세요..."
-
-#, fuzzy
#~ msgid " -c - clean headers cache directory.\n"
#~ msgstr " -v - 상세 정보 모드.\n"
@@ -2955,9 +2985,6 @@ msgstr "하드 디스크를 찾을 수 없습니다."
#~ msgid "virtual medium needs to be local"
#~ msgstr "매체 「%s」가 이미 사용되는 목록을 사용하려 합니다. 매체 무시됨."
-#~ msgid "Error generating names file: dependency %d not found"
-#~ msgstr "파일 이름 생성중 오류: %d 의존성을 찾을수 없습니다."
-
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr "파일 이름 생성중 오류: 파일(%s)에 쓸 수 없습니다."
diff --git a/po/ky.po b/po/ky.po
index e5e28ead..1d8caea1 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +103,93 @@ msgstr "_Калтыруу"
msgid "Choose location to save file"
msgstr "Сактоо үчүн орун тандаңыз"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\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-2005 Mandriva.\n"
+"Бул эркин программалык жабдуу жана аны GNU GPL\n"
+"шартынын негизинде таркатууга болот.\n"
+"\n"
+"колдонулушу:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - системаны жаңылоо үчүн автоматтык түрдө пакеттерди.\n"
+" тандоо.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - кээ бир пакеттер жок болсо дагы, мажбурлап аткаруу.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - орнотуу алдында rpm сигнатурасын текшерүү\n"
+" (--no-verify-rpm муну өчүрөт, алдынала күйгүзүлгөн).\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - орнотуу үчүн башка түп колдонуу.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - туура орнотулгандыгын текшерүү мүмүкүнчүлүгү.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - талап кылынган (же жаңыланган) пакеттерди издөө "
+"үчүн көрсөтүлгөн булактарды гана колдонуу.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "%s аттуу пакет жок"
@@ -264,6 +350,11 @@ msgstr "Орнотуу аяктады"
msgid "removing %s"
msgstr "%s алынып салынууда"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "urpmi кайра ишке киргизилүүдө"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -414,7 +505,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Көчүрүү ишке ашпады"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "\"%s\" булагы тандалган эмес"
@@ -878,6 +976,11 @@ msgstr "\"%s\" булагы алынып салынууда"
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -931,7 +1034,12 @@ msgstr "...кайра конфигурациялоо ишке ашпады"
msgid "reconfiguration done"
msgstr "кайра конфигурациялоо аяктады"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" булагы тандалган эмес"
@@ -1190,13 +1298,6 @@ msgstr ""
"\n"
"колдонулушу:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - бул жардамды чыгаруу.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1228,12 +1329,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - орнотуу үчүн башка түп колдонуу.\n"
-#: ../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"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1601,13 +1696,6 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - туура өчүрүү мүмүкүнчүлүгүн текшерүү.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - кээ бир пакеттер жок болсо дагы, мажбурлап аткаруу.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1705,31 +1793,6 @@ msgstr " (y/N) "
msgid "Removal failed"
msgstr "Алып салуу ишке ашпады"
-#: ../urpmi:69
-#, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\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-2005 Mandriva.\n"
-"Бул эркин программалык жабдуу жана аны GNU GPL\n"
-"шартынын негизинде таркатууга болот.\n"
-"\n"
-"колдонулушу:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - талап кылынган (же жаңыланган) пакеттерди издөө "
-"үчүн көрсөтүлгөн булактарды гана колдонуу.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1737,14 +1800,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - системаны жаңылоо үчүн автоматтык түрдө пакеттерди.\n"
-" тандоо.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1863,11 +1918,6 @@ msgstr ""
" --allow-force - колдонуучудан пакеттердин көз карандылыктарына\n"
" жана бүтүндүгүнө карабай орнотуу уруксатын алуу.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - орнотуу үчүн башка түп колдонуу.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1951,22 +2001,6 @@ msgstr ""
" --bug - баг отчетторун кийинки аргумент\n"
" көрсөткөн каталогго sчыгаруу.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - орнотуу алдында rpm сигнатурасын текшерүү\n"
-" (--no-verify-rpm муну өчүрөт, алдынала күйгүзүлгөн).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - туура орнотулгандыгын текшерүү мүмүкүнчүлүгү.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2287,12 +2321,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "Калтыруу"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "urpmi кайра ишке киргизилүүдө"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Даяр болгон соң, Enter басыңыз..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3062,9 +3096,6 @@ msgstr "changelog табылбады\n"
#~ "түшүнүлбөгөн \"%s\" булагы чыкма түзүлүш катары көрсөтүлгөн, бирок ал "
#~ "андай эмес"
-#~ msgid "Press Enter when ready..."
-#~ msgstr "Даяр болгон соң, Enter басыңыз..."
-
#~ msgid " -c - clean headers cache directory.\n"
#~ msgstr " -c - башсаптар (headers) кэшинин каталогун тазалоо.\n"
diff --git a/po/lt.po b/po/lt.po
index f7fd9ac8..7bc139ac 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +106,93 @@ msgstr "_Atšaukti"
msgid "Choose location to save file"
msgstr "Pasirinkite vietą bylos išsaugojimui"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versija %s\n"
+"Autorinės teisės (C) 1999-2005 Mandriva.\n"
+"Tai yra nemokama programa, kuri gali būti platinama pagal GNU GPL "
+"licenciją.\n"
+"\n"
+"naudojimas:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - spausdinti šį pagalbos pranešimą.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - automatiškai parinkti paketus sistemos atnaujinimui.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - vykdyti kreipimąsi, net jei nėra keleto paketų.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - prieš įdiegimą patikrinti rpm ženklą\n"
+" (--no-verify-rpm funkciją išjungia, standartiškai ji yra "
+"įjungta).\n"
+
+#: ../gurpmi.pm:52 ../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 - naudoti tik duotąsias laikmenas, atskirtas kableliu.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - rpm įdiegimui naudokite kitą pradinį.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - patikrinti, ar įdiegimas gali būti įvykdytas teisingai.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - pareikalautų (arba atnaujintų) paketų paieškai naudokite "
+"tik duotąją laikmeną.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Išsaugoti paketų pasirinkimą"
@@ -265,6 +351,11 @@ msgstr "Įdiegimas baigtas"
msgid "removing %s"
msgstr "pašalinama %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "iš naujo paleidžiama urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -415,7 +506,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Kopijavimas nepavyko"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "laikmena \"%s\" neišrinkta"
@@ -879,6 +977,11 @@ msgstr "pašalinama laikmena \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -932,7 +1035,12 @@ msgstr "...naujas konfigūravimas nepavyko"
msgid "reconfiguration done"
msgstr "naujas konfigūravimas atliktas"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "laikmena \"%s\" neišrinkta"
@@ -1191,13 +1299,6 @@ msgstr ""
"\n"
"naudojimas:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - spausdinti šį pagalbos pranešimą.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1228,12 +1329,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - rpm įdiegimui naudokite kitą pradinį.\n"
-#: ../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 - naudoti tik duotąsias laikmenas, atskirtas kableliu.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1605,12 +1700,6 @@ msgstr ""
" --test - tikrinti, jei pašalinimas negali būti tinkamai "
"įvykdytas.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - vykdyti kreipimąsi, net jei nėra keleto paketų.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1708,31 +1797,6 @@ msgstr " (t/N) "
msgid "Removal failed"
msgstr "Pašalinimas nepavyko"
-#: ../urpmi:69
-#, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versija %s\n"
-"Autorinės teisės (C) 1999-2005 Mandriva.\n"
-"Tai yra nemokama programa, kuri gali būti platinama pagal GNU GPL "
-"licenciją.\n"
-"\n"
-"naudojimas:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - pareikalautų (arba atnaujintų) paketų paieškai naudokite "
-"tik duotąją laikmeną.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1740,13 +1804,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - automatiškai parinkti paketus sistemos atnaujinimui.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1864,11 +1921,6 @@ msgstr ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - rpm įdiegimui naudokite kitą pradinį.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1956,24 +2008,6 @@ msgstr ""
" --bug - išvesti klaidų ataskaitą kataloge, kuris nurodytas\n"
" sekančiu argumentu.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - prieš įdiegimą patikrinti rpm ženklą\n"
-" (--no-verify-rpm funkciją išjungia, standartiškai ji yra "
-"įjungta).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - patikrinti, ar įdiegimas gali būti įvykdytas teisingai.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2293,12 +2327,12 @@ msgstr[2] ""
msgid "Cancel"
msgstr "Atšaukti"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "iš naujo paleidžiama urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Kai būsite pasiruošę, paspauskite Enter..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3057,9 +3091,6 @@ msgstr "Nerastas changelog\n"
#~ 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"
diff --git a/po/lv.po b/po/lv.po
index 0ced7065..f3753136 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +91,85 @@ msgstr "At_celt"
msgid "Choose location to save file"
msgstr "Izvēlieties failu"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"mdkupdate versija %s\n"
+"Autortiesības (C) %s Mandriva.\n"
+"Šī ir brīva programmatūra, ko var izplatīt saskaņā ar GNU GPL noteikumiem.\n"
+"\n"
+"Pielietojums:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - izvadīt šo palīdzības ziņojumu.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+
+#: ../gurpmi.pm:52 ../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 - izveidot atjaunināšanas datu nesēju.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, fuzzy, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --wget - lietot wget, lai iegūtu attālinātos failus.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - pārbaudīt, vai instalācija var tikt veikta korekti.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr " --update - izveidot atjaunināšanas datu nesēju.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Saglabāt pakotņu izvēli"
@@ -244,6 +322,11 @@ msgstr "Instalēšana pabeigta"
msgid "removing %s"
msgstr "Atvienoju %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr ""
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -396,7 +479,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Neveiksmīga Pieteikšanās"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "datu nesējs \"%s\" nav izvēlēts"
@@ -858,6 +948,11 @@ msgstr "noņemu datu nesēju \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -911,7 +1006,12 @@ msgstr "Izvēlnes konfigurācija saglabāta"
msgid "reconfiguration done"
msgstr "Servera konfigurācija"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "datu nesējs \"%s\" nav izvēlēts"
@@ -1169,13 +1269,6 @@ msgstr ""
"\n"
"Pielietojums:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - izvadīt šo palīdzības ziņojumu.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1204,11 +1297,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --wget - lietot wget, lai iegūtu attālinātos failus.\n"
-#: ../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 - izveidot atjaunināšanas datu nesēju.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, fuzzy, c-format
msgid ""
@@ -1574,12 +1662,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - pārbaudīt, vai instalācija var tikt veikta korekti.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1674,28 +1756,6 @@ msgstr " (j/N) "
msgid "Removal failed"
msgstr "Neveiksmīga Pieteikšanās"
-#: ../urpmi:69
-#, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdkupdate versija %s\n"
-"Autortiesības (C) %s Mandriva.\n"
-"Šī ir brīva programmatūra, ko var izplatīt saskaņā ar GNU GPL noteikumiem.\n"
-"\n"
-"Pielietojums:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --update - izveidot atjaunināšanas datu nesēju.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1703,12 +1763,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1811,11 +1865,6 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:110 ../urpmq:68
-#, fuzzy, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --wget - lietot wget, lai iegūtu attālinātos failus.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1894,21 +1943,6 @@ msgid ""
" next arg.\n"
msgstr ""
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - pārbaudīt, vai instalācija var tikt veikta korekti.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2207,12 +2241,12 @@ msgstr[2] ""
msgid "Cancel"
msgstr "Atcelt"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr ""
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Nospiediet Enter, kad gatavs..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -2925,9 +2959,6 @@ msgstr "Cietņi netika atrasti"
#~ 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"
diff --git a/po/mk.po b/po/mk.po
index 0fc47b5b..f27b5643 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +106,93 @@ msgstr "_Откажи"
msgid "Choose location to save file"
msgstr "Изберете локација за зачувување на датотека"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi верзија %s\n"
+"Авторски права (C) 1999-2005 Mandriva.\n"
+"Овој софтвер е бесплатен и може да се редистрибуира под условите на GNU "
+"GPL.\n"
+"\n"
+"употреба:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - автоматски ги избира пакетите за ажурирање на системот.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - принуди преживување дури и ако некои пакети не постојат.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - потврди го rpm потписот пред инсталација\n"
+" (--no-verify-rpm го оневозможува, стандардно е "
+"овозможен).\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - користи друг root за инсталирање на rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - проверете дали инсталацијата ќе заврши успешно.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - го користи само дадениот медиум за пребарување на "
+"бараните (или ажурираните) пакети.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "нема пакет именуван како %s"
@@ -267,6 +353,11 @@ msgstr "Инсталирањето заврши"
msgid "removing %s"
msgstr "отстранувам %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "рестартирам urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -417,7 +508,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Копирањето не успеа"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "не е избран медиумот \"%s\""
@@ -884,6 +982,11 @@ msgstr "го отстранувам медиумот \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -939,7 +1042,12 @@ msgstr "...реконфигурирањето не успеа"
msgid "reconfiguration done"
msgstr "реконфигурирањето заврши"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "не е избран медиумот \"%s\""
@@ -1197,13 +1305,6 @@ msgstr ""
"\n"
"употреба:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - ја испишува оваа помошна порака.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1234,12 +1335,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - користи друг root за инсталирање на rpm.\n"
-#: ../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"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1619,13 +1714,6 @@ msgstr " --auto - автоматски изберете пакет со
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - проверете дали отстранувањето ќе заврши успешно.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - принуди преживување дури и ако некои пакети не постојат.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1728,31 +1816,6 @@ msgstr " (y/N) "
msgid "Removal failed"
msgstr "Отстранувањето не успеа"
-#: ../urpmi:69
-#, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi верзија %s\n"
-"Авторски права (C) 1999-2005 Mandriva.\n"
-"Овој софтвер е бесплатен и може да се редистрибуира под условите на GNU "
-"GPL.\n"
-"\n"
-"употреба:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - го користи само дадениот медиум за пребарување на "
-"бараните (или ажурираните) пакети.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1760,13 +1823,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - автоматски ги избира пакетите за ажурирање на системот.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1889,11 +1945,6 @@ msgstr ""
"без\n"
" проверка на зависностите и интегритетот.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - користи друг root за инсталирање на rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1979,23 +2030,6 @@ msgstr ""
" --bug - запиши извештај за бубачка во директориум индициран од\n"
" следниот аргумент.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - потврди го rpm потписот пред инсталација\n"
-" (--no-verify-rpm го оневозможува, стандардно е "
-"овозможен).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - проверете дали инсталацијата ќе заврши успешно.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2320,12 +2354,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "Откажи"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "рестартирам urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Притиснете Ентер кога сте подготвени..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3089,9 +3123,6 @@ msgstr "Не е пронајдена измена на евиденцијата\
#~ 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"
diff --git a/po/mn.po b/po/mn.po
index 070355e6..d7e4e21d 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +86,87 @@ msgstr "_Хүчингүй"
msgid "Choose location to save file"
msgstr ""
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"mdkupdate Version %s\n"
+"Copyright ® %s Mandriva.\n"
+"Энэ бол чөлөөт программ хангамж ба GNU GPL лицензын дагуу цааш \n"
+"тарааж болно.\n"
+"\n"
+"Ашиглалт: \n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+"\n"
+" үгүй бол"
+
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
+#, c-format
+msgid " --media - use only the given media, separated by comma.\n"
+msgstr ""
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, fuzzy, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr "Мөр"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Тухайлсан тушаал алга"
@@ -238,6 +318,11 @@ msgstr "Суулгалт боломжтой"
msgid "removing %s"
msgstr "%s-г устгаж байна"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr ""
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -386,7 +471,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Хуулалт бүтэлгүйтэв"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "с бол"
@@ -845,6 +937,11 @@ msgstr "%s багцийг устгалт"
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -898,7 +995,12 @@ msgstr "Цэсний тохируулга хадгалагдсан"
msgid "reconfiguration done"
msgstr "Серверийн тохируулга"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "с бол"
@@ -1157,13 +1259,6 @@ msgstr ""
"\n"
"Ашиглалт: \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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - Энэ тусламжийг хэвлэх.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1192,11 +1287,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
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 ""
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1558,12 +1648,6 @@ msgstr "Автоматаар сонгогдсон багцуудыг харуу
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, fuzzy, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1656,29 +1740,6 @@ msgstr " (y/N) "
msgid "Removal failed"
msgstr "Хуулалт бүтэлгүйтэв"
-#: ../urpmi:69
-#, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdkupdate Version %s\n"
-"Copyright ® %s Mandriva.\n"
-"Энэ бол чөлөөт программ хангамж ба GNU GPL лицензын дагуу цааш \n"
-"тарааж болно.\n"
-"\n"
-"Ашиглалт: \n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1686,12 +1747,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1794,11 +1849,6 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:110 ../urpmq:68
-#, fuzzy, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr "Мөр"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1877,22 +1927,6 @@ msgid ""
" next arg.\n"
msgstr "гаралт ямх\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-"\n"
-" үгүй бол"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2180,12 +2214,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "Хүчингүй"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr ""
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Бэлэн болонгуут Enter товчоо дарна уу..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2882,9 +2916,6 @@ msgstr "Зураг олдсонгүй"
#~ 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"
diff --git a/po/ms.po b/po/ms.po
index a35d63f1..79382a76 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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"
@@ -91,7 +91,84 @@ msgstr "_Batal"
msgid "Choose location to save file"
msgstr "Pilih lokasi untuk menyimpan fail"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"versi mdkupdate %s\n"
+"Hakmilik (C) %s Mandriva.\n"
+"Ini adalah perisian percuma dan boleh disebarkan dibawah akta GNU GPL.\n"
+"\n"
+"penggunaan:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - paksa instal meskipun beberapa pakej tiada.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../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"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr " --update - guna hanya kemaskini media.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Tiada pakej dinyatakan"
@@ -245,6 +322,11 @@ msgstr "Pemasangan selesai"
msgid "removing %s"
msgstr "membuang %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, fuzzy, c-format
+msgid "restarting urpmi"
+msgstr "Mengulanghidup $prog:"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -394,7 +476,14 @@ msgstr "Main pelbagai jenis permainan solitaire"
msgid "Copying failed"
msgstr "Sambungan Gagal"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "Fail %s adalah jenis tidak disokong pada masa ini"
@@ -858,6 +947,11 @@ msgid "adding medium \"%s\""
msgstr "Medium Boleh Buang Terlekap"
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Direktori didalam nama path yang diberi tidak wujud."
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -912,7 +1006,12 @@ msgstr "...gagal mengulangtetap"
msgid "reconfiguration done"
msgstr "selesai ulangtetap"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "media \"%s\" tidak dipilih"
@@ -1170,13 +1269,6 @@ 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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - cetak mesej bantuan ini.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1205,11 +1297,6 @@ msgstr ""
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
-#, 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
#, c-format
msgid ""
@@ -1568,12 +1655,6 @@ 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
-#, c-format
-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
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1670,28 +1751,6 @@ msgstr " (y/T) "
msgid "Removal failed"
msgstr "Pembuangan gagal"
-#: ../urpmi:69
-#, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"versi mdkupdate %s\n"
-"Hakmilik (C) %s Mandriva.\n"
-"Ini adalah perisian percuma dan boleh disebarkan dibawah akta GNU GPL.\n"
-"\n"
-"penggunaan:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --update - guna hanya kemaskini media.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1699,12 +1758,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1807,11 +1860,6 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr ""
-#: ../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"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1884,20 +1932,6 @@ msgid ""
" next arg.\n"
msgstr ""
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2201,12 +2235,14 @@ msgstr[1] ""
msgid "Cancel"
msgstr "Batal"
-#: ../urpmi:665
+#: ../urpmi:635
#, fuzzy, c-format
-msgid "restarting urpmi"
-msgstr "Mengulanghidup $prog:"
+msgid "Press Enter when mounted..."
+msgstr ""
+"Tekan <Enter> untuk mengulangbut sistem anda.\n"
+"\n"
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -2912,11 +2948,5 @@ msgstr "Tiada log perubahan dijumpai\n"
#~ 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 9f9fa7ef..fcc82c4c 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +107,89 @@ msgstr "I_kkanċella"
msgid "Choose location to save file"
msgstr "Agħżel fejn tikteb il-fajl"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, fuzzy, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi verżjoni %s\n"
+"Copyright (C) 1999-2005 Mandriva.\n"
+"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
+"GPL.\n"
+"\n"
+"użu:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - uri dan il-messaġġ ta' għajnuna.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - agħżel pakketti awtomatikament biex taġġorna s-sistema.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - imponi l-invokazzjoni anke jekk xi pakketti ma jeżistux.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - ivverifika l-firma tal-pakkett qabel tinstalla.\n"
+" (--no-verify-rpm itfih, impliċitament mixgħul).\n"
+
+#: ../gurpmi.pm:52 ../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 - uża biss is-sorsi llistjati b'virgoli.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - uża root ieħor għall-installazzjoni rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - ivverifika li l-installazzjoni tista' ssir sew.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr " --media - uża biss is-sorsi llistjati b'virgoli.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Ebda kmand speċifikat"
@@ -267,6 +349,11 @@ msgstr "Installazzjoni lesta"
msgid "removing %s"
msgstr "qed jitneħħa %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "qed jiġi ristartjat urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -417,7 +504,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Ikkupjar falla"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "sors \"%s\" mhuwiex magħżul"
@@ -878,6 +972,11 @@ msgstr "qed jitneħħa s-sors \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -933,7 +1032,12 @@ msgstr "...rikonfigurazzjoni falliet"
msgid "reconfiguration done"
msgstr "rikonfigurazzjoni lesta"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "sors \"%s\" mhuwiex magħżul"
@@ -1192,13 +1296,6 @@ msgstr ""
"\n"
"użu:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - uri dan il-messaġġ ta' għajnuna.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1228,11 +1325,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - uża root ieħor għall-installazzjoni rpm.\n"
-#: ../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 - uża biss is-sorsi llistjati b'virgoli.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1598,13 +1690,6 @@ msgstr " --auto - agħżel pakkett awtomatikament fl-għażla.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - ivverifika li l-installazzjoni tista' ssir sew.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - imponi l-invokazzjoni anke jekk xi pakketti ma jeżistux.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1701,29 +1786,6 @@ msgstr " (i/L) "
msgid "Removal failed"
msgstr "Tneħħija falliet"
-#: ../urpmi:69
-#, fuzzy, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi verżjoni %s\n"
-"Copyright (C) 1999-2005 Mandriva.\n"
-"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
-"GPL.\n"
-"\n"
-"użu:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --media - uża biss is-sorsi llistjati b'virgoli.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1731,13 +1793,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - agħżel pakketti awtomatikament biex taġġorna s-sistema.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1856,11 +1911,6 @@ msgstr ""
" pakketti mingħajr ma jiġu ċċekkjati d-dipendenzi \n"
" u integrità.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - uża root ieħor għall-installazzjoni rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1947,22 +1997,6 @@ msgstr ""
" --bug - ipproduċi rapport ta' bug fid-direttorju indikat "
"fl- argument li jmiss.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - ivverifika l-firma tal-pakkett qabel tinstalla.\n"
-" (--no-verify-rpm itfih, impliċitament mixgħul).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - ivverifika li l-installazzjoni tista' ssir sew.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2277,12 +2311,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "Ikkanċella"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "qed jiġi ristartjat urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Agħfas Enter meta tlesti..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3031,9 +3065,6 @@ msgstr "Ma nstabx changelog\n"
#~ 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"
diff --git a/po/nb.po b/po/nb.po
index 8d0eda32..bd11537b 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +112,92 @@ msgstr "_Avbryt"
msgid "Choose location to save file"
msgstr "Velg sted hvor fil skal lagres."
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi – versjon %s\n"
+"Copyright © 1999-2008 Mandriva.\n"
+"Dette er fri programvare og kan redistribueres under vilkårene til GNU GPL.\n"
+"\n"
+"Bruk:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 – Vis denne hjelpeteksten.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto – Ikke-interaktiv modus. Anta anta standardsvar på alle "
+"spørsmål.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select – Velg automatisk alle pakker for oppgradering av "
+"systemet.\n"
+
+#: ../gurpmi.pm:49 ../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 selv om noen pakker ikke eksisterer.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm – Kontroller rpm-signatur før installering\n"
+" (Bruk «--no-verify-rpm» for å ikke kontrollere.\n"
+" Standard er å kontrollere.)\n"
+
+#: ../gurpmi.pm:52 ../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 – Bruk bare gitt medie (kommadelt liste).\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root – Bruk annen rot for rpm-installering.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test – Bare kontroller at installering vil fungere.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr " --searchmedia – Bare se etter pakker i dette mediet.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Ingen pakker spesifisert"
@@ -270,6 +355,11 @@ msgstr "Installasjon ferdig"
msgid "removing %s"
msgstr "Fjerner «%s»."
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "starter urpmi på nytt"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -420,7 +510,14 @@ msgstr "For mange argumenter\n"
msgid "Copying failed"
msgstr "Mislykket kopiering."
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "Medium «%s» er ikke tilgjengelig."
@@ -885,6 +982,11 @@ msgid "adding medium \"%s\""
msgstr "Legger til medium «%s»."
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Omgivelsekatalog %s eksisterer ikke"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "Denne adressa ser ikke ut til å inneholde en distribusjon."
@@ -939,7 +1041,12 @@ msgstr "... klarte ikke endre oppsett."
msgid "reconfiguration done"
msgstr "Fullført endring av oppsett."
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "Feil ved generering av navnfil: Fant ikke avhengigheten «%d»"
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "Mediumet «%s» er av nyeste versjon."
@@ -1198,13 +1305,6 @@ msgstr ""
"\n"
"Bruk: urpmf [valg] søkestrenguttrykk\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help – Vis denne hjelpeteksten.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1237,11 +1337,6 @@ msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
" --urpmi-root – Bruk annen rot for urpmi-database og rpm-installering.\n"
-#: ../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 – Bruk bare gitt medie (kommadelt liste).\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1610,13 +1705,6 @@ msgstr " --auto – Velg automatisk vagger ved flere alternativ.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test – Kontroller at fjerning vil fungere.\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 selv om noen pakker ikke eksisterer.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1712,28 +1800,6 @@ msgstr " (j/N) "
msgid "Removal failed"
msgstr "Klarte ikke fjerne."
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi – versjon %s\n"
-"Copyright © 1999-2008 Mandriva.\n"
-"Dette er fri programvare og kan redistribueres under vilkårene til GNU GPL.\n"
-"\n"
-"Bruk:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia – Bare se etter pakker i dette mediet.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1743,14 +1809,6 @@ msgstr ""
" --auto – Ikke-interaktiv modus. Anta anta standardsvar på alle "
"spørsmål.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select – Velg automatisk alle pakker for oppgradering av "
-"systemet.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1867,11 +1925,6 @@ msgstr ""
" --allow-force – Tillat å spørre bruker om å installere pakker uten\n"
" sjekking av avhengigheter og integritet.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root – Bruk annen rot for rpm-installering.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1954,23 +2007,6 @@ msgid ""
msgstr ""
" --bug – Skriv feilrapport i mappa valgt av neste argument.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm – Kontroller rpm-signatur før installering\n"
-" (Bruk «--no-verify-rpm» for å ikke kontrollere.\n"
-" Standard er å kontrollere.)\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test – Bare kontroller at installering vil fungere.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2292,12 +2328,12 @@ msgstr[1] "Vil du fortsette med installering av de %d pakkene?"
msgid "Cancel"
msgstr "Avbryt"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "starter urpmi på nytt"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Trykk Enter når det er klart..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3036,18 +3072,12 @@ msgstr "Fant ingen endringslogg\n"
#~ 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."
-#~ msgid "Error generating names file: dependency %d not found"
-#~ msgstr "Feil ved generering av navnfil: Fant ikke avhengigheten «%d»"
-
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr "Feil ved generering av navnfil: Kan ikke skrive til fila (%s)."
diff --git a/po/nl.po b/po/nl.po
index 98955483..93a9c8e7 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +114,99 @@ msgstr "_Annuleren"
msgid "Choose location to save file"
msgstr "Kies locatie om bestand in op te slaan"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versie %s\n"
+"Copyright © 1999-2008 Mandriva.\n"
+"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
+"GNU GPL.\n"
+"\n"
+"gebruik:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - geeft deze hulptekst.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - niet-interactieve modus, standaardantwoorden op vragen "
+"aannemen.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - automatisch pakketten selecteren voor "
+"systeemopwaardering.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - aanroep forceren zelfs als sommige pakketten niet "
+"bestaan.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - rpm-handtekening verifiëren vóór installatie.\n"
+" (--no-verify-rpm schakelt dit uit, standaard "
+"ingeschakeld).\n"
+
+#: ../gurpmi.pm:52 ../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 - alleen de aangegeven media, kommagescheiden.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+" --root - gebruik andere hoofdmap (root) voor rpm-installatie.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - verifiëren dat de installatie correct uitgevoerd kan "
+"worden.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - alleen de aangegeven media gebruiken om gewenste "
+"pakketten te zoeken.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Geen pakketten gespecificeerd"
@@ -277,6 +369,11 @@ msgstr "Installatie voltooid"
msgid "removing %s"
msgstr "verwijderen van %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "urpmi herstarten"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -428,7 +525,14 @@ msgstr "Te veel argumenten\n"
msgid "Copying failed"
msgstr "Kopiëren mislukt"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "medium \"%s\" is niet beschikbaar."
@@ -893,6 +997,11 @@ msgid "adding medium \"%s\""
msgstr "bezig met toevoegen van medium \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Omgevingsmap %s bestaat niet"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "deze locatie lijkt geen distributie te bevatten"
@@ -948,7 +1057,13 @@ msgstr "...herconfiguratie mislukt"
msgid "reconfiguration done"
msgstr "herconfiguratie voltooid"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+"Fout bij het genereren van namenbestand: afhankelijkheid %d niet gevonden"
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medium \"%s\" is bijgewerkt"
@@ -1207,13 +1322,6 @@ msgstr ""
"\n"
"gebruik: urpmf [opties] patroon-expressie\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - geeft deze hulptekst.\n"
-
#
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
@@ -1248,11 +1356,6 @@ msgstr ""
" --urpmi-root - gebruik andere hoofdmap (root) voor urpmi db & rpm-"
"installatie.\n"
-#: ../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 - alleen de aangegeven media, kommagescheiden.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1624,14 +1727,6 @@ msgstr ""
" --test - verifiëren dat de verwijdering correct uitgevoerd kan "
"worden.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - aanroep forceren zelfs als sommige pakketten niet "
-"bestaan.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1733,31 +1828,6 @@ msgstr " (j/N) "
msgid "Removal failed"
msgstr "Verwijderen is mislukt"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versie %s\n"
-"Copyright © 1999-2008 Mandriva.\n"
-"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
-"GNU GPL.\n"
-"\n"
-"gebruik:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - alleen de aangegeven media gebruiken om gewenste "
-"pakketten te zoeken.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1767,14 +1837,6 @@ msgstr ""
" --auto - niet-interactieve modus, standaardantwoorden op vragen "
"aannemen.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - automatisch pakketten selecteren voor "
-"systeemopwaardering.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1895,12 +1957,6 @@ msgstr ""
" installeren zonder afhankelijkhedencontrole en zonder\n"
" integriteitscontrole.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-" --root - gebruik andere hoofdmap (root) voor rpm-installatie.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1984,25 +2040,6 @@ msgstr ""
" --bug - schrijf een foutrapport naar de map aangegeven\n"
" door het volgende argument.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - rpm-handtekening verifiëren vóór installatie.\n"
-" (--no-verify-rpm schakelt dit uit, standaard "
-"ingeschakeld).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - verifiëren dat de installatie correct uitgevoerd kan "
-"worden.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2337,12 +2374,12 @@ msgstr[1] "Verdergaan met de installatie van de %d pakketten?"
msgid "Cancel"
msgstr "Annuleren"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "urpmi herstarten"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Druk op Enter wanneer u klaar bent..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3110,19 +3147,12 @@ msgstr "Geen wijzigingslogboek gevonden\n"
#~ "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"
-#~ msgid "Error generating names file: dependency %d not found"
-#~ msgstr ""
-#~ "Fout bij het genereren van namenbestand: afhankelijkheid %d niet gevonden"
-
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr ""
#~ "Fout bij het genererenvan namenbestand: Kan niet naar bestand schrijven (%"
diff --git a/po/nn.po b/po/nn.po
index 1e0e7e65..4b5f5622 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-03-03 20:44+0100\n"
"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -104,7 +104,91 @@ msgstr "_Avbryt"
msgid "Choose location to save file"
msgstr "Vel plassering av lagra fil."
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi – versjon %s\n"
+"Copyright © 1999–2006 Mandriva.\n"
+"Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
+"lisensen.\n"
+"\n"
+"Bruk:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 – Vis denne hjelpeteksten.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto – Ikkje-interaktiv modus. Anta standardsvar på alle "
+"spørsmål.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select – Vel automatisk alle pakkar som kan oppdaterast.\n"
+
+#: ../gurpmi.pm:49 ../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"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm – Kontroller rpm-signatur før installering.\n"
+" (Bruk «--no-verify-rpm» til ikkje å kontrollera.\n"
+" Standard er å kontrollera.)\n"
+
+#: ../gurpmi.pm:52 ../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 – Bruk berre gitt medium (kommadelt liste).\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root – Bruk anna rot for rpm-installering.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test – Berre kontroller at installeringa kan fungera.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr " --searchmedia – Berre sjå etter pakkar i dette mediet.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Ingen pakkar valde"
@@ -178,12 +262,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
@@ -260,6 +346,11 @@ msgstr "Installeringa er fullført"
msgid "removing %s"
msgstr "Fjernar «%s»."
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "Startar urpmi på nytt."
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -412,7 +503,14 @@ msgstr "For mange argument.\n"
msgid "Copying failed"
msgstr " mislukka kopiering."
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "Mediet «%s» er ikkje tilgjengeleg."
@@ -591,7 +689,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)"
@@ -795,7 +894,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
@@ -877,6 +977,11 @@ msgid "adding medium \"%s\""
msgstr "Legg til mediet «%s»."
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Miljømappa «%s» finst ikkje."
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "Denne adressa ser ikkje ut til å innehelda ein distribusjon."
@@ -931,7 +1036,12 @@ msgstr "... klarte ikkje endra oppsett."
msgid "reconfiguration done"
msgstr "Fullført endring av oppsett."
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "Mediet «%s» er i nyaste versjon."
@@ -1190,13 +1300,6 @@ msgstr ""
"\n"
"Bruk: urpmf [val] mønster-uttrykk\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help – Vis denne hjelpeteksten.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1205,7 +1308,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
@@ -1214,25 +1318,25 @@ 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"
-
-#: ../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 – Bruk berre gitt medium (kommadelt liste).\n"
+msgstr ""
+" --urpmi-root – Bruk anna rot for urpmi-database og rpm-installering.\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
@@ -1485,7 +1589,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"
@@ -1592,11 +1697,6 @@ msgstr " --auto – Vel automatisk pakkar ved fleire alternativ.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
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"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1669,7 +1769,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"
@@ -1690,28 +1791,6 @@ msgstr " (J/N) "
msgid "Removal failed"
msgstr "Klarte ikkje fjerna."
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi – versjon %s\n"
-"Copyright © 1999–2006 Mandriva.\n"
-"Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
-"lisensen.\n"
-"\n"
-"Bruk:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia – Berre sjå etter pakkar i dette mediet.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1721,11 +1800,6 @@ msgstr ""
" --auto – Ikkje-interaktiv modus. Anta standardsvar på alle "
"spørsmål.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select – Vel automatisk alle pakkar som kan oppdaterast.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1814,11 +1888,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"
@@ -1841,11 +1917,6 @@ msgstr ""
" --allow-force – Tillèt å spørja brukarar å installera pakkar\n"
" utan sjekking av avhengnader og integritet.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root – Bruk anna rot for rpm-installering.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1928,23 +1999,6 @@ msgid ""
" next arg.\n"
msgstr " --bug – Skriv feilrapport i mappa valt av neste argument.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm – Kontroller rpm-signatur før installering.\n"
-" (Bruk «--no-verify-rpm» til ikkje å kontrollera.\n"
-" Standard er å kontrollera.)\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test – Berre kontroller at installeringa kan fungera.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -1965,7 +2019,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
@@ -1987,7 +2042,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
@@ -2050,8 +2106,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
@@ -2264,12 +2322,12 @@ msgstr[1] "Vil du halda fram med installeringa av dei %d pakkane?"
msgid "Cancel"
msgstr "Avbryt"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "Startar urpmi på nytt."
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Trykk så «Enter» ..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2371,7 +2429,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
@@ -2405,7 +2464,8 @@ 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"
+msgstr ""
+" --raw – Legg mediet til oppsettet, men ikkje oppdater det.\n"
#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
@@ -2505,13 +2565,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
@@ -2783,7 +2845,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
@@ -2797,7 +2860,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"
@@ -2809,7 +2873,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"
@@ -2817,7 +2882,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
@@ -2893,7 +2959,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
@@ -2942,7 +3009,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
@@ -2971,13 +3039,16 @@ 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
@@ -3016,9 +3087,5 @@ msgstr "Fann ikkje endringslogg.\n"
#~ 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 bea01428..cd852b39 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +103,91 @@ msgstr "ਰੱਦ(_C)"
msgid "Choose location to save file"
msgstr "ਫਾਇਲ਼ ਸੰਭਾਲਣ ਲਈ ਟਿਕਾਣਾ ਦਿਓ"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\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-2008 Mandriva.\n"
+"ਇਹ ਮੁਫਤ ਹੈ ਅਤੇ ਇਸ ਨੂੰ GNU GPL ਹੇਠ ਮੁੜ ਵੰਡਿਆ ਜਾ ਸਕਦਾ ਹੈ।\n"
+"\n"
+"ਵਰਤੋਂ:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - print this help message.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../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"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - force invocation even if some packages do not exist.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disable it, default is enabled).\n"
+
+#: ../gurpmi.pm:52 ../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 - use only the given media, separated by comma.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - use another root for rpm installation.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - verify if the installation can be achieved correctly.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - use only the given media to search requested (or updated) "
+"packages.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "ਕੋਈ ਪੈਕੇਜ %s ਨਾਂ ਨਾਲ ਨਹੀਂ"
@@ -263,6 +347,11 @@ msgstr "ਇੰਸਟਾਲੇਸ਼ ਸਮਾਪਤ"
msgid "removing %s"
msgstr "%s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "urpmi ਮੁੜ ਚਾਲੂ"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -413,7 +502,14 @@ msgstr ""
msgid "Copying failed"
msgstr "ਨਕਲ ਕਰਨੀ ਅਸਫਲ"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "ਮਾਧਿਅਮ \"%s\" ਚੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
@@ -874,6 +970,11 @@ msgstr "ਮਾਧਿਅਮ \"%s\" ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -927,7 +1028,12 @@ msgstr "...ਮੁੜ-ਸੰਰਚਨਾ ਅਸਫਲ"
msgid "reconfiguration done"
msgstr "ਮੁੜ ਸੰਰਚਨਾ ਹੋਈ"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "ਮਾਧਿਅਮ \"%s\" ਚੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
@@ -1185,13 +1291,6 @@ msgstr ""
"\n"
"ਵਰਤੋਂ:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - print this help message.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1222,11 +1321,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - use another root for rpm installation.\n"
-#: ../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 - use only the given media, separated by comma.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1590,13 +1684,6 @@ msgstr " --auto - automatically select a package in choices.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - verify if the removal can be achieved correctly.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - force invocation even if some packages do not exist.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1691,30 +1778,6 @@ msgstr " (y/N) "
msgid "Removal failed"
msgstr "ਹਟਾਉਣਾ ਅਸਫਲ"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\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-2008 Mandriva.\n"
-"ਇਹ ਮੁਫਤ ਹੈ ਅਤੇ ਇਸ ਨੂੰ GNU GPL ਹੇਠ ਮੁੜ ਵੰਡਿਆ ਜਾ ਸਕਦਾ ਹੈ।\n"
-"\n"
-"ਵਰਤੋਂ:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - use only the given media to search requested (or updated) "
-"packages.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1722,13 +1785,6 @@ msgid ""
"questions.\n"
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"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1843,11 +1899,6 @@ msgstr ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - use another root for rpm installation.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1930,23 +1981,6 @@ msgstr ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disable it, default is enabled).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - verify if the installation can be achieved correctly.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2264,12 +2298,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "ਰੱਦ ਕਰੋ"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "urpmi ਮੁੜ ਚਾਲੂ"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਤਿਆਰ ਹੋਣ ਤੇ Enter ਦਬਾਓ..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3010,9 +3044,6 @@ msgstr "ਕੋਈ changelog ਨਹੀਂ\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"
diff --git a/po/pl.po b/po/pl.po
index 47b16a92..8a93fa60 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-03-05 09:57+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,7 +116,98 @@ msgstr "_Anuluj"
msgid "Choose location to save file"
msgstr "Wybierz miejsce zapisania pliku"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi wersja %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"To jest otwarte oprogramowanie i może być rozpowszechniane na zasadach "
+"licencji GNU GPL.\n"
+"\n"
+"użycie:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - wyświetla ten komunikat pomocy.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - tryb nieinteraktywny, stosuje domyślne odpowiedzi na "
+"pytania.\n"
+
+#: ../gurpmi.pm:48 ../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"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+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"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - bada podpis cyfrowy pakietu przed instalacją.\n"
+" (--no-verify-rpm wyłącza, domyślnie włączone).\n"
+
+#: ../gurpmi.pm:52 ../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 - używa tylko podanych nośników, rozdzielonych "
+"przecinkami.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - używa innego katalogu głównego do instalacji rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - sprawdza, czy instalacja zostanie przeprowadzona "
+"prawidłowo.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+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"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Nie wybrano pakietów"
@@ -187,13 +281,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
@@ -270,6 +368,11 @@ msgstr "Instalacja zakończona"
msgid "removing %s"
msgstr "usuwanie %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "ponownie uruchamianie urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -420,7 +523,14 @@ msgstr "Zbyt wiele argumentów\n"
msgid "Copying failed"
msgstr "Kopiowanie zakończone niepowodzeniem"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "nośnik %s jest niedostępny"
@@ -599,7 +709,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)"
@@ -804,7 +915,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
@@ -888,6 +1000,11 @@ msgid "adding medium \"%s\""
msgstr "dodawanie nośnika %s"
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Katalog %s nie istnieje"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "wygląda na to, że we wskazanej lokalizacji nie ma dystrybucji"
@@ -944,7 +1061,12 @@ msgstr "...zmiana konfiguracji zakończone niepowodzeniem"
msgid "reconfiguration done"
msgstr "zmiana konfiguracji zakończona"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "nośnik %s jest aktualny"
@@ -1205,13 +1327,6 @@ msgstr ""
"\n"
"użycie: urpmf [opcje] pattern-expression\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - wyświetla ten komunikat pomocy.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1220,7 +1335,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
@@ -1231,8 +1347,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
@@ -1243,16 +1361,10 @@ msgstr ""
" --urpmi-root - używa innego katalogu głównego bazy danych urpmi i "
"instalacji rpm.\n"
-#: ../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 - używa tylko podanych nośników, rozdzielonych "
-"przecinkami.\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 - sortuje nośniki w zależności od podciągów rozdzielonych\n"
" przecinkami.\n"
@@ -1359,7 +1471,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
@@ -1510,7 +1623,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"
@@ -1619,13 +1733,6 @@ msgstr ""
" --test - sprawdza, czy instalacja zostanie przeprowadzona "
"prawidłowo.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-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"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1698,10 +1805,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
@@ -1721,30 +1831,6 @@ msgstr " (t/N) "
msgid "Removal failed"
msgstr "Usuwanie zakończone niepowodzeniem"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi wersja %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"To jest otwarte oprogramowanie i może być rozpowszechniane na zasadach "
-"licencji GNU GPL.\n"
-"\n"
-"użycie:\n"
-
-#: ../urpmi:78
-#, c-format
-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"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1754,11 +1840,6 @@ msgstr ""
" --auto - tryb nieinteraktywny, stosuje domyślne odpowiedzi na "
"pytania.\n"
-#: ../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"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1767,7 +1848,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
@@ -1793,7 +1875,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
@@ -1838,7 +1921,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
@@ -1852,7 +1936,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"
@@ -1876,11 +1961,6 @@ msgstr ""
" instalację pakietów bez sprawdzania zależności\n"
" i spójności.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - używa innego katalogu głównego do instalacji rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1965,24 +2045,6 @@ msgstr ""
" --bug - raport błędów w katalogu wskazanym przez\n"
" następny argument\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - bada podpis cyfrowy pakietu przed instalacją.\n"
-" (--no-verify-rpm wyłącza, domyślnie włączone).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - sprawdza, czy instalacja zostanie przeprowadzona "
-"prawidłowo.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -1996,7 +2058,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
@@ -2049,12 +2112,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
@@ -2069,7 +2134,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
@@ -2088,11 +2154,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"
@@ -2159,7 +2227,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
@@ -2310,12 +2379,12 @@ msgstr[2] "Rozpocząć instalację 1 pakietu? (%d MB)"
msgid "Cancel"
msgstr "Anuluj"
-#: ../urpmi:665
+#: ../urpmi:635
#, c-format
-msgid "restarting urpmi"
-msgstr "ponownie uruchamianie urpmi"
+msgid "Press Enter when mounted..."
+msgstr ""
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2419,7 +2488,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
@@ -2443,7 +2513,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
@@ -2500,7 +2571,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
@@ -2557,7 +2629,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"
@@ -2565,7 +2638,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
@@ -2768,7 +2842,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
@@ -2854,17 +2929,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"
@@ -2961,7 +3040,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
@@ -2981,19 +3061,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
@@ -3033,14 +3116,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 ""
"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"
@@ -3049,4 +3134,3 @@ msgstr ""
#, c-format
msgid "No changelog found\n"
msgstr "Nie znaleziono dziennika zmian\n"
-
diff --git a/po/pt.po b/po/pt.po
index d7379ce6..b45d3985 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-03-03 23:31+0000\n"
"Last-Translator: Zé <mmodem00@gmail.com>\n"
"Language-Team: Português <pt@li.org>\n"
@@ -121,7 +121,96 @@ msgstr "_Cancelar"
msgid "Choose location to save file"
msgstr "Escolha a localização para gravar o ficheiro"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versão %s\n"
+"Direitos de autor (C) 1999-2008 Mandriva.\n"
+"Isto é programa livre e pode ser redistribuído sob o termos da GPL GNU.\n"
+"\n"
+"uso:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - mostra esta mensagem de ajuda.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - modo não-interactivo, assume respostas predefinidas às "
+"questões.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - selecciona automaticamente os pacotes para actualizar o "
+"sistema.\n"
+
+#: ../gurpmi.pm:49 ../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"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - verifica a assinatura do rpm antes de instalar.\n"
+" (--no-verify-rpm desactiva-o, activo por predefinição).\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - usa outra raiz para a instalação rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - verifica apenas se a instalação pode ser conseguida "
+"correctamente.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+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"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Nenhum pacote indicado"
@@ -196,13 +285,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
@@ -278,6 +370,11 @@ msgstr "Instalação finalizada"
msgid "removing %s"
msgstr "a remover %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "a reiniciar urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -430,7 +527,14 @@ msgstr "Demasiados argumentos\n"
msgid "Copying failed"
msgstr "Cópia falhada"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "a média \"%s\" não está disponível"
@@ -609,8 +713,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
@@ -893,6 +999,11 @@ msgid "adding medium \"%s\""
msgstr "a adicionar média \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "O directório de ambiente %s não existe"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "esta localização não parece conter uma distribuição"
@@ -949,7 +1060,12 @@ msgstr "...reconfiguração falhada"
msgid "reconfiguration done"
msgstr "reconfiguração terminada"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "a média \"%s\" está actualizada"
@@ -1047,7 +1163,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
@@ -1207,13 +1324,6 @@ msgstr ""
"\n"
"uso:urpmf [opções] expressão-padrão\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - mostra esta mensagem de ajuda.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1233,7 +1343,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"
@@ -1247,14 +1358,10 @@ msgstr ""
" --urpmi-root - usa outra raiz para base de dados urpmi e instalação "
"rpm.\n"
-#: ../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"
-
#: ../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"
@@ -1480,7 +1587,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
@@ -1510,11 +1618,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"
@@ -1613,22 +1723,20 @@ 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"
-
-#: ../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"
+msgstr ""
+" --test - verifica se a remoção pode ser conseguida correctamente.\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
@@ -1663,7 +1771,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
@@ -1698,9 +1807,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
@@ -1719,29 +1830,6 @@ msgstr " (s/N) "
msgid "Removal failed"
msgstr "Remoção falhada"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versão %s\n"
-"Direitos de autor (C) 1999-2008 Mandriva.\n"
-"Isto é programa livre e pode ser redistribuído sob o termos da GPL GNU.\n"
-"\n"
-"uso:\n"
-
-#: ../urpmi:78
-#, c-format
-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"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1751,13 +1839,6 @@ msgstr ""
" --auto - modo não-interactivo, assume respostas predefinidas às "
"questões.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - selecciona automaticamente os pacotes para actualizar o "
-"sistema.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1776,7 +1857,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
@@ -1815,7 +1897,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
@@ -1851,7 +1934,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"
@@ -1874,11 +1958,6 @@ msgstr ""
" --allow-force - permite perguntar ao utilizador se deseja instalar\n"
" os pacotes sem verificar as dependências e integridade.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - usa outra raiz para a instalação rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1966,24 +2045,6 @@ msgstr ""
" --bug - escreve um relatório de erro na pasta indicada\n"
" no próximo argumento.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - verifica a assinatura do rpm antes de instalar.\n"
-" (--no-verify-rpm desactiva-o, activo por predefinição).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - verifica apenas se a instalação pode ser conseguida "
-"correctamente.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -1997,7 +2058,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
@@ -2038,12 +2100,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
@@ -2097,7 +2161,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"
@@ -2164,7 +2229,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
@@ -2314,12 +2380,12 @@ msgstr[1] "Prosseguir com a instalação dos %d pacotes?"
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:665
+#: ../urpmi:635
#, c-format
-msgid "restarting urpmi"
-msgstr "a reiniciar urpmi"
+msgid "Press Enter when mounted..."
+msgstr ""
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2352,7 +2418,8 @@ msgstr ""
" cdrom://<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"
@@ -2375,7 +2442,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
@@ -2440,7 +2508,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
@@ -2455,7 +2524,8 @@ 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"
+msgstr ""
+" --raw - adiciona a média na configuração, mas não a actualiza.\n"
#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51
#, c-format
@@ -2480,7 +2550,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
@@ -2500,7 +2571,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
@@ -2556,7 +2628,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"
@@ -2756,7 +2829,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
@@ -2840,7 +2914,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
@@ -2849,7 +2924,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"
@@ -2857,11 +2933,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"
@@ -2932,7 +3010,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
@@ -2977,7 +3056,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
@@ -2991,17 +3071,20 @@ 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
@@ -3029,14 +3112,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"
@@ -3045,4 +3130,3 @@ msgstr ""
#, c-format
msgid "No changelog found\n"
msgstr "Nenhum registo de mudanças (changelog) encontrado\n"
-
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3b7525ba..7175253f 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-02-14 14:13-0300\n"
"Last-Translator: \n"
"Language-Team: Brazilian Portuguese <pt@li.org>\n"
@@ -122,7 +122,94 @@ msgstr "_Cancelar"
msgid "Choose location to save file"
msgstr "Escolha o local para salvar o arquivo"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versão %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Este é um software livre, e pode ser redistribuído sob os termos da GNU "
+"GPL.\n"
+"\n"
+"uso:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - imprime esta mensagem de ajuda.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - modo não-interativo, assume respostas padrão para as\n"
+" perguntas.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - automaticamente seleciona os pacotes necessários para \n"
+" atualizar o sistema.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - força mesmo se alguns pacotes não existem.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - verifica a assinatura do rpm antes da instalação.\n"
+" (--no-verify-rpm desabilita, por padrão é habilitado).\n"
+
+#: ../gurpmi.pm:52 ../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 - use somente as mídias listadas (separadas por vírgula).\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - use outro root para instalação rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - apenas verifica se a instalação pode ser efetuada\n"
+" corretamente.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr " --searchmedia - usa apenas a mídia fornecida para buscar pacotes.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Nenhum pacote especificado"
@@ -281,6 +368,11 @@ msgstr "Instalação concluída"
msgid "removing %s"
msgstr "removendo %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "reiniciando urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -432,7 +524,14 @@ msgstr "Muitos parâmetros\n"
msgid "Copying failed"
msgstr "Falha na cópia"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "mídia \"%s\" não está disponível"
@@ -896,6 +995,11 @@ msgid "adding medium \"%s\""
msgstr "adicionando a mídia \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Diretório de ambiente %s não existe"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "não foi encontrada uma distribuinão nesta localização"
@@ -951,7 +1055,12 @@ msgstr "...falha na reconfiguração"
msgid "reconfiguration done"
msgstr "reconfiguração terminada"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "Erro gerando arquivo de nomes: dependência %d não encontrada"
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "mídia \"%s\" já está atualizada"
@@ -1210,13 +1319,6 @@ msgstr ""
"\n"
"uso: urpmf [opções] expressão\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - imprime esta mensagem de ajuda.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1250,12 +1352,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --urpmi-root - use outro root para o urpmi e instalação rpm.\n"
-#: ../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 - use somente as mídias listadas (separadas por vírgula).\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1627,12 +1723,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - verifica se a remoção pode ser feita corretamente.\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 mesmo se alguns pacotes não existem.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1730,29 +1820,6 @@ msgstr " (s/N) "
msgid "Removal failed"
msgstr "A remoção falhou"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versão %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Este é um software livre, e pode ser redistribuído sob os termos da GNU "
-"GPL.\n"
-"\n"
-"uso:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - usa apenas a mídia fornecida para buscar pacotes.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1762,14 +1829,6 @@ msgstr ""
" --auto - modo não-interativo, assume respostas padrão para as\n"
" perguntas.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - automaticamente seleciona os pacotes necessários para \n"
-" atualizar o sistema.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1885,11 +1944,6 @@ msgstr ""
" --allow-force - permite ao usuário instalar pacotes sem conferir\n"
" dependências e integridade.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - use outro root para instalação rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1976,24 +2030,6 @@ msgstr ""
" --bug - escreve um relatório de falhas no diretório indicado\n"
" pelo próximo argumento.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - verifica a assinatura do rpm antes da instalação.\n"
-" (--no-verify-rpm desabilita, por padrão é habilitado).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - apenas verifica se a instalação pode ser efetuada\n"
-" corretamente.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2322,12 +2358,12 @@ msgstr[1] "Proceder a instalação de %d pacotes?"
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "reiniciando urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Tecle Enter quando estiver pronto..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -3091,18 +3127,12 @@ msgstr "Arquivo com as alterações não foi encontrado \n"
#~ 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"
-#~ msgid "Error generating names file: dependency %d not found"
-#~ msgstr "Erro gerando arquivo de nomes: dependência %d não encontrada"
-
#~ msgid "Error generating names file: Can't write to file (%s)"
#~ msgstr ""
#~ "Erro gerando arquivo de nomes: Não foi possível escrever no arquivo (%s)"
diff --git a/po/ro.po b/po/ro.po
index 8dd29130..d3ccee79 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +114,94 @@ msgstr "_Renunţă"
msgid "Choose location to save file"
msgstr "Alegeţi locul unde salvez fişierul"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versiunea %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Acest program este soft liber şi poate fi redistribuit sub termenii GNU "
+"GPL.\n"
+"\n"
+"Utilizare:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - afişează acest mesaj de ajutor.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - selectare automată pachete pentru actualizare sistem.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - forţează invocarea chiar dacă unele pachete nu există.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - verifică semnătura rpm înainte de instalare.\n"
+" (--no-verify-rpm o dezactivează, implicit este "
+"activată).\n"
+
+#: ../gurpmi.pm:52 ../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 - foloseşte numai mediile date, separate prin virgulă.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+" --root - foloseşte altă rădăcină pentru instalarea rpm-urilor.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - verifică dacă instalarea poate fi îndeplinită corect.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --media - foloseşte numai mediile date, separate prin virgulă.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Nu a fost specificată nici o comandă"
@@ -273,6 +360,11 @@ msgstr "Instalare terminată"
msgid "removing %s"
msgstr "elimin %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "repornesc urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -423,7 +515,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Copierea a eşuat"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "mediul \"%s\" nu este selectat"
@@ -888,6 +987,11 @@ msgstr "elimin mediul \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -941,7 +1045,12 @@ msgstr "...reconfigurarea a eşuat"
msgid "reconfiguration done"
msgstr "reconfigurarea s-a încheiat"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "mediul \"%s\" nu este selectat"
@@ -1199,13 +1308,6 @@ msgstr ""
"\n"
"Utilizare:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - afişează acest mesaj de ajutor.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1237,12 +1339,6 @@ msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
" --root - foloseşte altă rădăcină pentru instalarea rpm-urilor.\n"
-#: ../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 - foloseşte numai mediile date, separate prin virgulă.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1615,13 +1711,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - verifică dacă instalarea poate fi îndeplinită corect.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - forţează invocarea chiar dacă unele pachete nu există.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1724,30 +1813,6 @@ msgstr " (D/n) "
msgid "Removal failed"
msgstr "Ştergere nereuşită"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versiunea %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Acest program este soft liber şi poate fi redistribuit sub termenii GNU "
-"GPL.\n"
-"\n"
-"Utilizare:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --media - foloseşte numai mediile date, separate prin virgulă.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1755,13 +1820,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - selectare automată pachete pentru actualizare sistem.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1880,12 +1938,6 @@ msgstr ""
" pachetelor fără verificarea dependenţelor şi a "
"integrităţii.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-" --root - foloseşte altă rădăcină pentru instalarea rpm-urilor.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1972,24 +2024,6 @@ msgstr ""
" --bug - produce un raport de erori în directorul indicat de \n"
" argumentul următor.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - verifică semnătura rpm înainte de instalare.\n"
-" (--no-verify-rpm o dezactivează, implicit este "
-"activată).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - verifică dacă instalarea poate fi îndeplinită corect.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2305,12 +2339,12 @@ msgstr[2] ""
msgid "Cancel"
msgstr "Renunţă"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "repornesc urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Apăsaţi Enter când e gata..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3074,9 +3108,6 @@ msgstr "Nu s-a gasit changelog\n"
#~ 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"
diff --git a/po/ru.po b/po/ru.po
index 45fe24b5..7a4af983 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+0100\n"
"PO-Revision-Date: 2008-03-04 00:56+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,7 +105,96 @@ msgstr "_Отмена"
msgid "Choose location to save file"
msgstr "Укажите местоположение, где сохранить файл"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\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-2008 Mandriva.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
+"\n"
+"использование:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - неинтерактивный режим; на вопросы даются ответы по "
+"умолчанию.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - автоматический выбор пакетов для обновления системы.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - принудительное выполнение, даже если некоторые пакеты\n"
+" не существуют\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - проверять подписи rpm перед установкой\n"
+" (--no-verify-rpm отключает её; по умолчанию включена)\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - использовать другой корень для установки rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - проверить возможность корректной установки\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - использование только указанных источников для поиска\n"
+" запрошенных пакетов.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Пакеты не указаны"
@@ -140,8 +225,7 @@ msgstr ""
msgid "Warning"
msgstr "Внимание"
-#: ../gurpmi2:114
-#: ../urpmi:626
+#: ../gurpmi2:114 ../urpmi:626
#, c-format
msgid "Ok"
msgstr "ОК"
@@ -182,16 +266,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
@@ -206,14 +290,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 "Подготовка..."
@@ -223,8 +305,7 @@ msgstr "Подготовка..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Устанавливается пакет `%s' (%s/%s)..."
-#: ../gurpmi2:264
-#: ../urpmi:622
+#: ../gurpmi2:264 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Вставьте носитель под названием \"%s\""
@@ -239,8 +320,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"
@@ -251,9 +331,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:"
@@ -269,12 +347,16 @@ msgstr "Все уже установлено"
msgid "Installation finished"
msgstr "Установка завершена"
-#: ../gurpmi2:310
-#: ../urpme:132
+#: ../gurpmi2:310 ../urpme:132
#, c-format
msgid "removing %s"
msgstr "удаляется %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "urpmi перезапускается"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -309,8 +391,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 "Только суперпользователю разрешается устанавливать пакеты"
@@ -345,18 +426,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"
@@ -391,8 +467,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"
@@ -405,7 +480,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
@@ -417,8 +494,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"
@@ -428,14 +504,19 @@ 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
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "источник \"%s\" недоступен"
@@ -460,9 +541,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]"
@@ -600,7 +679,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
@@ -614,8 +694,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
@@ -637,8 +719,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"
@@ -683,8 +764,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:"
@@ -719,9 +799,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 "Установка не удалась"
@@ -756,8 +834,7 @@ msgstr "Попробовать установить без проверки за
msgid "Try harder to install (--force)? (y/N) "
msgstr "Попробовать принудительную установку (--force)? (y/N)"
-#: ../urpm/main_loop.pm:259
-#: ../urpm/main_loop.pm:267
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267
#, c-format
msgid "Error"
msgstr "Ошибка"
@@ -821,7 +898,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
@@ -841,10 +920,10 @@ msgstr "попытка переопределить существующий и
#: ../urpm/media.pm:409
#, c-format
msgid "failed to migrate removable device, ignoring media"
-msgstr "не удалось выполнить миграцию съёмного устройства; источник игнорируется"
+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]"
@@ -861,8 +940,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
@@ -900,6 +983,11 @@ msgid "adding medium \"%s\""
msgstr "добавляется источник \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Каталог окружения %s не существует"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "невозможно найти дистрибутив по этому адресу"
@@ -954,7 +1042,12 @@ msgstr "...перенастройка не удалась"
msgid "reconfiguration done"
msgstr "перенастройка выполнена"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "Ошибка создания файла имён: не найдена зависимость %d"
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "источник \"%s\" уже обновлён"
@@ -969,15 +1062,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 "...копирование не удалось"
@@ -987,8 +1077,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 "...копирование выполнено"
@@ -1003,8 +1092,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-суммы не совпадают)"
@@ -1039,8 +1127,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\""
@@ -1090,24 +1177,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Дд"
@@ -1172,8 +1249,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,8 +1279,7 @@ msgstr "невозможно использовать опцию parallel \"%s\"
msgid "unable to access medium \"%s\"."
msgstr "нет доступа к источнику \"%s\"."
-#: ../urpm/removable.pm:66
-#: ../urpm/removable.pm:84
+#: ../urpm/removable.pm:66 ../urpm/removable.pm:84
#, c-format
msgid "mounting %s"
msgstr "монтируется %s"
@@ -1214,395 +1289,307 @@ msgstr "монтируется %s"
msgid "unmounting %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
-#, 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"
-
-#: ../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"
+" --root-root - использовать другой корень для базы данных urpmi и "
+"установки пакетов.\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\""
@@ -1614,22 +1601,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"
@@ -1639,8 +1626,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"
@@ -1700,13 +1686,15 @@ msgstr "Невозможно переместить файл %s в %s"
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2008 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-2008 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
"\n"
"использование:\n"
@@ -1720,24 +1708,12 @@ msgstr " --auto - автоматически выбрать пакет
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - проверить возможность корректного удаления\n"
-#: ../urpme:48
-#: ../urpmi:104
-#: ../urpmq:65
-#, c-format
-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"
@@ -1761,9 +1737,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"
@@ -1788,8 +1762,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 нарушит работу вашей системы"
@@ -1807,7 +1780,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 пакетов"
@@ -1818,10 +1792,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) "
@@ -1831,38 +1802,14 @@ msgstr " (y/N) "
msgid "Removal failed"
msgstr "Удаление не удалось"
-#: ../urpmi:69
+#: ../urpmi:81
#, c-format
msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
-"\n"
-"usage:\n"
+" --auto - non-interactive mode, assume default answers to "
+"questions.\n"
msgstr ""
-"urpmi версия %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
-"\n"
-"использование:\n"
-
-#: ../urpmi:78
-#, c-format
-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"
-
-#: ../urpmi:82
-#: ../urpmq:52
-#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - автоматический выбор пакетов для обновления системы.\n"
+" --auto - неинтерактивный режим; на вопросы даются ответы по "
+"умолчанию.\n"
#: ../urpmi:83
#, c-format
@@ -1879,31 +1826,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
@@ -1951,12 +1902,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
@@ -1976,12 +1930,6 @@ msgstr ""
" --allow-force - разрешить устанавливать пакеты без проверки зависимостей\n"
" и целостности после запроса у пользователя\n"
-#: ../urpmi:110
-#: ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - использовать другой корень для установки rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -2018,16 +1966,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"
@@ -2041,10 +1989,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"
@@ -2053,10 +1998,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"
@@ -2074,20 +2016,6 @@ msgstr ""
" --bug - вывести отчёт об ошибках в каталог, определённый\n"
" следующим аргументом\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - проверять подписи rpm перед установкой\n"
-" (--no-verify-rpm отключает её; по умолчанию включена)\n"
-
-#: ../urpmi:134
-#, c-format
-msgid " --test - only verify if the installation can be achieved correctly.\n"
-msgstr " --test - проверить возможность корректной установки\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2101,7 +2029,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
@@ -2144,8 +2073,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"
@@ -2173,12 +2101,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
@@ -2192,17 +2122,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
@@ -2254,7 +2192,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
@@ -2284,8 +2224,7 @@ msgstr ""
"более старых, чем установленные:\n"
"%s"
-#: ../urpmi:508
-#: ../urpmi:524
+#: ../urpmi:508 ../urpmi:524
#, c-format
msgid ""
"\n"
@@ -2294,10 +2233,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) "
@@ -2368,10 +2304,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
@@ -2406,12 +2344,12 @@ msgstr[1] "Установить %d пакетов?"
msgid "Cancel"
msgstr "Отмена"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "urpmi перезапускается"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Нажмите 'Enter', когда будете готовы..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2444,7 +2382,8 @@ msgstr ""
" cdrom://<путь>\n"
"\n"
"Использование: urpmi.addmedia [параметры] --distrib --mirrorlist <url>\n"
-"Использование: urpmi.addmedia [параметры] --mirrorlist <url> <название> <относительный путь>\n"
+"Использование: urpmi.addmedia [параметры] --mirrorlist <url> <название> "
+"<относительный путь>\n"
"\n"
"Примеры:\n"
"\n"
@@ -2454,26 +2393,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
@@ -2484,10 +2418,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
@@ -2543,8 +2480,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"
@@ -2559,16 +2495,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:43
-#: ../urpmi.update:51
+#: ../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"
@@ -2606,7 +2538,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
@@ -2637,13 +2571,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"
@@ -2655,11 +2591,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"
@@ -2750,8 +2689,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"
@@ -2841,7 +2779,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
@@ -2897,19 +2837,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"
@@ -2937,7 +2881,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
@@ -2946,17 +2891,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"
@@ -2964,7 +2913,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
@@ -3026,7 +2977,8 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr ""
" --whatrequires-recursive\n"
-" - расширенный реверсивный поиск (включая виртуальные пакеты).\n"
+" - расширенный реверсивный поиск (включая виртуальные "
+"пакеты).\n"
#: ../urpmq:90
#, c-format
@@ -3050,7 +3002,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
@@ -3070,12 +3023,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
@@ -3107,22 +3065,32 @@ msgstr "используйте -l для вывода списка файлов
#: ../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
@@ -3131,18 +3099,25 @@ 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 "
@@ -3151,108 +3126,143 @@ msgstr "Не найден журнал изменений\n"
#~ "нет доступа к источнику \"%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"
@@ -3260,14 +3270,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"
@@ -3278,6 +3293,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 3ec018f2..cad6e698 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +105,93 @@ msgstr "A_nnudda"
msgid "Choose location to save file"
msgstr "Sçobera anca sarvai su file"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versioni %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Custu est programa lìberu e fait a du spainai basçu is tèrminis de sa GNU "
+"GPL.\n"
+"\n"
+"impreu:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - amosta custa missada de ajudu.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - sçobera in automàtigu is pakitus po ajorronai su "
+"sistema.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - fortza sa essighidura mancai cancu pakitu no dui siat.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - aberiga sa firma rpm innantis de aposentai\n"
+" (--no-verify-rpm da disabivat, abivada desinuncas).\n"
+
+#: ../gurpmi.pm:52 ../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 - imprea feti is mèdius indidaus, pratzius de vìrgula.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - imprea un'atra root po aposentai is rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - aberiga ki fait a aposentai in manera lìmpia.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - imprea feti is mèdius indidaus po circai is pakitus "
+"(ajorronus) ki bolis.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "nisçunu pakitu nominau %s"
@@ -266,6 +352,11 @@ msgstr "Aposentadura acabada"
msgid "removing %s"
msgstr "srèxinu %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "torru a aberri urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -416,7 +507,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Còpia faddia"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "su mèdiu \"%s\" no d'as sçoberau"
@@ -879,6 +977,11 @@ msgstr "burru su mèdiu \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -932,7 +1035,12 @@ msgstr "...assètiu faddiu"
msgid "reconfiguration done"
msgstr "assètiu fatu"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "su mèdiu \"%s\" no d'as sçoberau"
@@ -1191,13 +1299,6 @@ msgstr ""
"\n"
"impreu:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - amosta custa missada de ajudu.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1229,12 +1330,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - imprea un'atra root po aposentai is rpm.\n"
-#: ../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 - imprea feti is mèdius indidaus, pratzius de vìrgula.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1607,13 +1702,6 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - aberiga ki fait a srexinai in manera lìmpia.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - fortza sa essighidura mancai cancu pakitu no dui siat.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1714,31 +1802,6 @@ msgstr " (y/N) "
msgid "Removal failed"
msgstr "Srexinadura faddia"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versioni %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Custu est programa lìberu e fait a du spainai basçu is tèrminis de sa GNU "
-"GPL.\n"
-"\n"
-"impreu:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - imprea feti is mèdius indidaus po circai is pakitus "
-"(ajorronus) ki bolis.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1746,14 +1809,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - sçobera in automàtigu is pakitus po ajorronai su "
-"sistema.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1869,11 +1924,6 @@ msgstr ""
" --allow-force - permiti de preguntai a su user ki bolit aposentai\n"
" pakitus sentza de controllai dependèntzias e interesa.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - imprea un'atra root po aposentai is rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1956,22 +2006,6 @@ msgstr ""
" --bug - produsi una arrelata-fartas in sa directory\n"
" indidada de s'argumentu ki sighit.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - aberiga sa firma rpm innantis de aposentai\n"
-" (--no-verify-rpm da disabivat, abivada desinuncas).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - aberiga ki fait a aposentai in manera lìmpia.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2292,12 +2326,12 @@ msgstr[1] "No fait a aposentai is pakitus (%s)!"
msgid "Cancel"
msgstr "Annudda"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "torru a aberri urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Craca Enter candu ses prontu..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3049,9 +3083,6 @@ msgstr "No apu agatau s'arrelata de is mudas\n"
#~ 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"
diff --git a/po/sk.po b/po/sk.po
index b73b0923..113fe2f4 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +103,95 @@ msgstr "_Zrušiť"
msgid "Choose location to save file"
msgstr "Vyberte umiestnenie pre uloženie súboru"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi verzia %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Toto je slobodný softvér, ktorý môže byť distribuovaný za podmienok GNU "
+"GPL.\n"
+"\n"
+"použitie:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - zobraziť túto pomoc.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - automatický výber balíkov pre aktualizáciu systému.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - vnútiť vykonanie aj ak niektoré balíky neexistujú.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - overiť podpis rpm balíka pred inštaláciou. (--no-verify-"
+"rpm\n"
+" zakáže overovanie, štandardne sa podpis overuje).\n"
+
+#: ../gurpmi.pm:52 ../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 - použiť len zadané zdroje; viaceré je možné oddeliť "
+"čiarkou.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+" --root - použiť iný koreňový adresár pre inštaláciu rpm balíkov.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - overiť či bude inštalácia vykonaná bez problémov.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - použiť iba zadaný zdroj pre nájdenie požadovaných (alebo "
+"aktualizovaných) balíkov.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "žiaden balík s menom %s"
@@ -266,6 +354,11 @@ msgstr "Inštalácia ukončená"
msgid "removing %s"
msgstr "odstraňovanie %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "znovuspustenie urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -417,7 +510,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Kopírovanie zlyhalo"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "zdroj \"%s\" nebol zvolený"
@@ -885,6 +985,11 @@ msgstr "odstránenie zdroja \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -940,7 +1045,12 @@ msgstr "...rekonfigurovanie zlyhalo"
msgid "reconfiguration done"
msgstr "rekonfigoranie hotové"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "zdroj \"%s\" nebol zvolený"
@@ -1197,13 +1307,6 @@ msgstr ""
"Toto je slobodný softvér a môže byť redistribuovaný pod licenciou GNU GPL.\n"
"použitie:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - zobraziť túto pomoc.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1237,13 +1340,6 @@ msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
" --root - použiť iný koreňový adresár pre inštaláciu rpm balíkov.\n"
-#: ../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 - použiť len zadané zdroje; viaceré je možné oddeliť "
-"čiarkou.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1611,13 +1707,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - overiť či bude odstránenie vykonané bez problémov.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - vnútiť vykonanie aj ak niektoré balíky neexistujú.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1719,31 +1808,6 @@ msgstr " (á/N) "
msgid "Removal failed"
msgstr "Odstránenie neskončilo úspechom"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi verzia %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Toto je slobodný softvér, ktorý môže byť distribuovaný za podmienok GNU "
-"GPL.\n"
-"\n"
-"použitie:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - použiť iba zadaný zdroj pre nájdenie požadovaných (alebo "
-"aktualizovaných) balíkov.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1751,13 +1815,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - automatický výber balíkov pre aktualizáciu systému.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1875,12 +1932,6 @@ msgstr ""
"bez\n"
" overovania závislosti a integrity.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-" --root - použiť iný koreňový adresár pre inštaláciu rpm balíkov.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1965,23 +2016,6 @@ msgstr ""
" --bug - vytvoriť oznámenie o chybe do adresára uvedeného\n"
" za argumentom.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - overiť podpis rpm balíka pred inštaláciou. (--no-verify-"
-"rpm\n"
-" zakáže overovanie, štandardne sa podpis overuje).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - overiť či bude inštalácia vykonaná bez problémov.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2307,12 +2341,12 @@ msgstr[2] ""
msgid "Cancel"
msgstr "Zrušiť"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "znovuspustenie urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Stlačte Enter ak je možné pokračovať..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3062,9 +3096,6 @@ msgstr "Nebol nájdený zoznam zmien\n"
#~ 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"
diff --git a/po/sl.po b/po/sl.po
index 795315dc..65fedeb7 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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"
@@ -114,7 +114,93 @@ msgstr "_Prekliči"
msgid "Choose location to save file"
msgstr "Izberite mesto za shranjevanje datoteke"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi različica %s\n"
+"Avtorske pravice (C) 1999-2008 Mandriva.\n"
+"To je prosta programska oprema in se sme razmnoževati pod dovoljenjem GNU "
+"GPL\n"
+"\n"
+"uporaba:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - prikaži to sporočilo s pomočjo.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - neinteraktiven način, uporabi privzete odgovore na "
+"vprašanja.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - samodejna izbira paketov za nadgraditev sistema.\n"
+
+#: ../gurpmi.pm:49 ../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"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - preveri podpis paketa rpm pred namestitvijo\n"
+" (--no-verify-rpm to onemogoči, privzeto je omogočeno).\n"
+
+#: ../gurpmi.pm:52 ../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 - uporabi samo podane vire, ločene z vejico.\n"
+
+#: ../gurpmi.pm:53 ../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"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - samo preveri, če je namestitev lahko pravilno izvedena.\n"
+
+#: ../gurpmi.pm:55 ../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"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Določen ni bil noben paket"
@@ -274,6 +360,11 @@ msgstr "Namestitev je končana"
msgid "removing %s"
msgstr "odstranjevanje %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "ponovno zaganjanje urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -426,7 +517,14 @@ msgstr "Prveč argumentov\n"
msgid "Copying failed"
msgstr "Kopiranje je spodletelo"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "vir »%s« ni na voljo"
@@ -896,6 +994,11 @@ msgid "adding medium \"%s\""
msgstr "dodajanje vira »%s«"
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Mapa %s ne obstaja"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "izgleda, da ta lokacija ne vsebuje nobene distribucije"
@@ -951,7 +1054,12 @@ msgstr "...ponovno nastavljanje je spodletelo"
msgid "reconfiguration done"
msgstr "ponovno nastavljanje je končano"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "vir »%s« je posodobljen"
@@ -1211,13 +1319,6 @@ msgstr ""
"\n"
"uporaba: urpmf [možnosti] vzorec(regularni izraz)\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - prikaži to sporočilo s pomočjo.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1250,11 +1351,6 @@ msgstr ""
" --urpmi-root - uporabi drugo izhodišče za podatkovno zbirko urpmi in "
"namestitev rpm.\n"
-#: ../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 - uporabi samo podane vire, ločene z vejico.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1625,13 +1721,6 @@ msgstr " --auto - samodejno izberi paket v možnostih.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
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"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1732,30 +1821,6 @@ msgstr " (d/N) "
msgid "Removal failed"
msgstr "Odstranjevanje je spodletelo"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi različica %s\n"
-"Avtorske pravice (C) 1999-2008 Mandriva.\n"
-"To je prosta programska oprema in se sme razmnoževati pod dovoljenjem GNU "
-"GPL\n"
-"\n"
-"uporaba:\n"
-
-#: ../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"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1765,12 +1830,6 @@ msgstr ""
" --auto - neinteraktiven način, uporabi privzete odgovore na "
"vprašanja.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - samodejna izbira paketov za nadgraditev sistema.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1890,12 +1949,6 @@ msgstr ""
"brez \n"
" preverjanja odvisnosti in integritete.\n"
-#: ../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"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1980,23 +2033,6 @@ msgstr ""
" --bug - pripravi poročilo o napaki v imeniku nakazanem z\n"
" naslednjim argumentom.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - preveri podpis paketa rpm pred namestitvijo\n"
-" (--no-verify-rpm to onemogoči, privzeto je omogočeno).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - samo preveri, če je namestitev lahko pravilno izvedena.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2321,12 +2357,12 @@ msgstr[3] "Nadaljujem z namestitvijo %d paketov?"
msgid "Cancel"
msgstr "Prekliči"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "ponovno zaganjanje urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Pritisnite Enter ko boste pripravljeni ..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3107,8 +3143,5 @@ msgstr "Dnevnik sprememb ni bil najden\n"
#~ 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 65628d1b..dd2f557b 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +86,92 @@ msgstr "_Anulo"
msgid "Choose location to save file"
msgstr "Zgjedhe një skedare"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi versioni %s\n"
+"E drejtë autori (C) 1999-2008 Mandriva.\n"
+"Ky është software gratis dhe mund të shpërndahet ndër termet e GNU GPL.\n"
+"\n"
+"përdorim:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - shtype këtë lajmë ndihmues.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - zgjedhni automatikisht pakot azhurnuese në sistem.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - kërkim i forcuar edhe pse disa pako nuk ekzistojnë.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - verifikoje nënshkrimin e rpm para instalimit\n"
+" (--no-verify-rpm dezaktivizoje verifikim e tyre).\n"
+
+#: ../gurpmi.pm:52 ../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 - përdori vetëm burimet e dhëna, të ndara me presje.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, fuzzy, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+" --wget - përdore wget për rikuperimin e skedareve në distancë.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - verifikoje nëse instalimi përfundon në mënyrë korrekte.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --media - përdori vetëm burimet e dhëna, të ndara me presje.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Asnjë urdhër i specifikuar"
@@ -245,6 +330,11 @@ msgstr "Instalimi përfundoi"
msgid "removing %s"
msgstr "zhdukja e %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr ""
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -397,7 +487,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Kopjimi dështoi"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "burimi \"%s\" nuk është i zgjedhur"
@@ -861,6 +958,11 @@ msgstr "zhdukja e burimit \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -916,7 +1018,12 @@ msgstr "Menyja e konfigurimit është regjistruar"
msgid "reconfiguration done"
msgstr "Konfigurimi i Serverit"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "burimi \"%s\" nuk është i zgjedhur"
@@ -1174,13 +1281,6 @@ msgstr ""
"\n"
"përdorim:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - shtype këtë lajmë ndihmues.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1214,12 +1314,6 @@ msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
" --wget - përdore wget për rikuperimin e skedareve në distancë.\n"
-#: ../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 - përdori vetëm burimet e dhëna, të ndara me presje.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1588,13 +1682,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - verifikoje nëse instalimi përfundon në mënyrë korrekte.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - kërkim i forcuar edhe pse disa pako nuk ekzistojnë.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1689,29 +1776,6 @@ msgstr " (p/J)"
msgid "Removal failed"
msgstr "Zhdukja dështoi"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi versioni %s\n"
-"E drejtë autori (C) 1999-2008 Mandriva.\n"
-"Ky është software gratis dhe mund të shpërndahet ndër termet e GNU GPL.\n"
-"\n"
-"përdorim:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --media - përdori vetëm burimet e dhëna, të ndara me presje.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1719,13 +1783,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - zgjedhni automatikisht pakot azhurnuese në sistem.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1844,12 +1901,6 @@ msgstr ""
" --allow-force - mundëson që përdoruesi në pytje të instaloj\n"
" pakot pas i verifikuar mvarësit dhe integritetin e tyre.\n"
-#: ../urpmi:110 ../urpmq:68
-#, fuzzy, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-" --wget - përdore wget për rikuperimin e skedareve në distancë.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1932,23 +1983,6 @@ msgstr ""
" --bug - dorëzoje një raport të bug(it) në repertorin e\n"
" sugjeruar nga argumenti i dytë.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - verifikoje nënshkrimin e rpm para instalimit\n"
-" (--no-verify-rpm dezaktivizoje verifikim e tyre).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - verifikoje nëse instalimi përfundon në mënyrë korrekte.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2259,12 +2293,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "Anulo"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr ""
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Shtypni mbi Enter kur jeni i gatshëm..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3008,9 +3042,6 @@ msgstr "Asnjë imazh i gjetur"
#~ "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"
diff --git a/po/sr.po b/po/sr.po
index 29afba05..ee796663 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +95,90 @@ msgstr "_Поништи"
msgid "Choose location to save file"
msgstr "Изаберите фајл"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\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-2008 Mandriva.\n"
+"Ово је бесплатан софтвер и може бити редистрибуиран под условима GNU GPL.\n"
+"\n"
+"употреба:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - аутоматска избор пакета да би се ажурирао систем.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - приморава на инвокацију чак и ако неки пакети не "
+"постоје.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - верификује rpm потписе пре инсталације.\n"
+" (--no-verify-rpm не веригикује, стандардна је "
+"верификација).\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --curl - користи још један root за rpm инсталацију.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - проверава да ли се може извести исправна инсталација.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr " --media - користи само дати медиј, одвојен зарезом.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Није одређена команда"
@@ -252,6 +335,11 @@ msgstr "Инсталација готова"
msgid "removing %s"
msgstr "уклањам %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "рестартујем urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -401,7 +489,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Копирање није успело"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "медиј \"%s\" није изабран"
@@ -865,6 +960,11 @@ msgstr "уклањам медиј \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -919,7 +1019,12 @@ msgstr "Конфигурација менија сачувана"
msgid "reconfiguration done"
msgstr "Подешавање сервера"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "медиј \"%s\" није изабран"
@@ -1177,13 +1282,6 @@ msgstr ""
"\n"
"употреба:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - приказује овај екран о помоћи.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1213,11 +1311,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --curl - користи још један root за rpm инсталацију.\n"
-#: ../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"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1584,14 +1677,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - проверава да ли се може извести исправна инсталација.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - приморава на инвокацију чак и ако неки пакети не "
-"постоје.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1688,28 +1773,6 @@ msgstr " (д/Н) "
msgid "Removal failed"
msgstr "Уклањање није успело"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\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-2008 Mandriva.\n"
-"Ово је бесплатан софтвер и може бити редистрибуиран под условима GNU GPL.\n"
-"\n"
-"употреба:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --media - користи само дати медиј, одвојен зарезом.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1717,12 +1780,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - аутоматска избор пакета да би се ажурирао систем.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1839,11 +1896,6 @@ msgstr ""
"без\n"
" провере међузависности и интегритета.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --curl - користи још један root за rpm инсталацију.\n"
-
#: ../urpmi:112
#, fuzzy, c-format
msgid ""
@@ -1928,24 +1980,6 @@ msgstr ""
" --bug - прави извештај о грешци у директоријуму прослеђеном\n"
" као следећи аргумент.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - верификује rpm потписе пре инсталације.\n"
-" (--no-verify-rpm не веригикује, стандардна је "
-"верификација).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - проверава да ли се може извести исправна инсталација.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2259,12 +2293,12 @@ msgstr[2] ""
msgid "Cancel"
msgstr "Одустани"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "рестартујем urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Притисните enter када будете спремни..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -2999,9 +3033,6 @@ msgstr "НИје пронађен image"
#~ msgstr ""
#~ "некохерентан медиј \"%s\" је означен као преносни али то није у стварности"
-#~ msgid "Press Enter when ready..."
-#~ msgstr "Притисните enter када будете спремни..."
-
#~ msgid " -c - clean headers cache directory.\n"
#~ msgstr " -c - чисти директоријум са кешом надглавља.\n"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 89211bee..dcf32a63 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +95,90 @@ msgstr "_Poništi"
msgid "Choose location to save file"
msgstr "Izaberite fajl"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi verzija %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Ovo je besplatan softver i može biti redistribuiran pod uslovima GNU GPL.\n"
+"\n"
+"upotreba:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - prikazuje ovaj ekran o pomoći.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - automatska izbor paketa da bi se ažurirao sistem.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - primorava na invokaciju čak i ako neki paketi ne "
+"postoje.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - verifikuje rpm potpise pre instalacije.\n"
+" (--no-verify-rpm ne verigikuje, standardna je "
+"verifikacija).\n"
+
+#: ../gurpmi.pm:52 ../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 - koristi samo dati medij, odvojen zarezom.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --curl - koristi još jedan root za rpm instalaciju.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - proverava da li se može izvesti ispravna instalacija.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr " --media - koristi samo dati medij, odvojen zarezom.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Nije određena komanda"
@@ -252,6 +335,11 @@ msgstr "Instalacija gotova"
msgid "removing %s"
msgstr "uklanjam %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "restartujem urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -401,7 +489,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Kopiranje nije uspelo"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "medij \"%s\" nije izabran"
@@ -865,6 +960,11 @@ msgstr "uklanjam medij \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -919,7 +1019,12 @@ msgstr "Konfiguracija menija sačuvana"
msgid "reconfiguration done"
msgstr "Podešavanje servera"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medij \"%s\" nije izabran"
@@ -1177,13 +1282,6 @@ msgstr ""
"\n"
"upotreba:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - prikazuje ovaj ekran o pomoći.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1214,11 +1312,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --curl - koristi još jedan root za rpm instalaciju.\n"
-#: ../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 - koristi samo dati medij, odvojen zarezom.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1585,14 +1678,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - proverava da li se može izvesti ispravna instalacija.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - primorava na invokaciju čak i ako neki paketi ne "
-"postoje.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1692,28 +1777,6 @@ msgstr " (d/N) "
msgid "Removal failed"
msgstr "Uklanjanje nije uspelo"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi verzija %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Ovo je besplatan softver i može biti redistribuiran pod uslovima GNU GPL.\n"
-"\n"
-"upotreba:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --media - koristi samo dati medij, odvojen zarezom.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1721,12 +1784,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - automatska izbor paketa da bi se ažurirao sistem.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1843,11 +1900,6 @@ msgstr ""
"bez\n"
" provere međuzavisnosti i integriteta.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --curl - koristi još jedan root za rpm instalaciju.\n"
-
#: ../urpmi:112
#, fuzzy, c-format
msgid ""
@@ -1932,24 +1984,6 @@ msgstr ""
" --bug - pravi izveštaj o grešci u direktorijumu prosleđenom\n"
" kao sledeći argument.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - verifikuje rpm potpise pre instalacije.\n"
-" (--no-verify-rpm ne verigikuje, standardna je "
-"verifikacija).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - proverava da li se može izvesti ispravna instalacija.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2264,12 +2298,12 @@ msgstr[2] ""
msgid "Cancel"
msgstr "Odustani"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "restartujem urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Pritisnite enter kada budete spremni..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3007,9 +3041,6 @@ msgstr "NIje pronađen image"
#~ 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"
diff --git a/po/sv.po b/po/sv.po
index d8ba48f0..6fd87668 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +114,91 @@ msgstr "Av_bryt"
msgid "Choose location to save file"
msgstr "Välj var filen ska sparas"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008, Mandriva.\n"
+"Det här är fri programvara och får distribueras enligt villkoren i GNU GPL.\n"
+"\n"
+"användning:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - visar det här hjälpmeddelandet.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - ej interaktivt läge. väljer standardsvar på alla frågor.\n"
+
+#: ../gurpmi.pm:48 ../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"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - tvinga användning även om vissa paket inte finns.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - verifiera rpm-signatur före installation (standard)\n"
+" (--no-verify-rpm inaktiverar det).\n"
+
+#: ../gurpmi.pm:52 ../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 - använd endast givet media, separerat med komma.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - använd en annan root för rpm installation.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - verifiera endast om installationen kan utföras korrekt.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+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"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Inga paket specifierade"
@@ -274,6 +358,11 @@ msgstr "Installation slutförd"
msgid "removing %s"
msgstr "tar bort %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "startar om urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -426,7 +515,14 @@ msgstr "För många argument\n"
msgid "Copying failed"
msgstr "Kopiering misslyckades"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "mediat \"%s\" är inte tillgängligt"
@@ -892,6 +988,11 @@ msgid "adding medium \"%s\""
msgstr "lägger till media \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Omgivning sökväg %s existerar inte"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "denna sökväg verkar inte innehålla någon distribution"
@@ -946,7 +1047,12 @@ msgstr "...omkonfigurering misslyckades"
msgid "reconfiguration done"
msgstr "omkonfigurering utförd"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "mediat \"%s\" är uppdaterat"
@@ -1204,13 +1310,6 @@ msgstr ""
"\n"
"användning:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - visar det här hjälpmeddelandet.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1239,11 +1338,6 @@ msgstr " --literal, -l - sök inte mönster, använd argument som söksträng.
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --urpmi-root - använd en annan rot för db & rpm installation.\n"
-#: ../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 - använd endast givet media, separerat med komma.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1610,12 +1704,6 @@ msgstr " --auto - välj automatiskt ett paket från valen.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
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"
-msgstr " --force - tvinga användning även om vissa paket inte finns.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1713,30 +1801,6 @@ msgstr " (j/N) "
msgid "Removal failed"
msgstr "Borttagning misslyckades"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008, Mandriva.\n"
-"Det här är fri programvara och får distribueras enligt villkoren i GNU GPL.\n"
-"\n"
-"användning:\n"
-
-#: ../urpmi:78
-#, c-format
-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"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1745,13 +1809,6 @@ msgid ""
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"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1867,11 +1924,6 @@ msgstr ""
" --allow-force - tillåter användaren att installera paket utan\n"
" kontroll av beroenden och integritet.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - använd en annan root för rpm installation.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1959,23 +2011,6 @@ msgstr ""
" --bug - mata ut en felrapport i katalogen som indikeras av\n"
" nästa arg.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - verifiera rpm-signatur före installation (standard)\n"
-" (--no-verify-rpm inaktiverar det).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - verifiera endast om installationen kan utföras korrekt.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2300,12 +2335,12 @@ msgstr[1] "Fortsätt installationen av %d paket?"
msgid "Cancel"
msgstr "Avbryt"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "startar om urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Tryck \"Enter\" vid klart..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3068,8 +3103,5 @@ msgstr "Ingen ändringslogg hittades\n"
#~ 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 9680100b..00b65b62 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +114,95 @@ msgstr "_Бекор кардан"
msgid "Choose location to save file"
msgstr "Барои захиракунии файл ҷойгиршавиро интихоб кунед"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\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 © 1999-2008 Mandriva.\n"
+"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
+"шавад.\n"
+"\n"
+"истифода:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - барои аз нав намудани систем барномаҳои "
+"коромодаробеихтиёрона интихоб намуд.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - ба таври маҷбурӣ истифода баред, ҳатто агар якчанд "
+"барномаҳои коромода вуҷуд надошта бошад.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - пеш аз коргузорӣ намудан имзоро тафтиш намоед \n"
+" (--no-verify-rpm онро хомӯш намоед, дохил шудааст аз "
+"рӯипешфарз).\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - дигар решаро барои коргузории rpm истифода баред.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - тафтиш намоед, ки оё коргузории дуруст ба амал меояд.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --media - истифодаи танҳо муҳити додашуда, бо вергул ҷудошуда.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "қуттии бо номи %s нест"
@@ -273,6 +361,11 @@ msgstr "Коргузориш шуд"
msgid "removing %s"
msgstr "хориҷи қуттии %s "
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "urpmi бозоғоз шуда истодааст"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -423,7 +516,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Нусхабардорӣ нагузашт"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "муҳити \"%s\" интихоб нашудааст"
@@ -885,6 +985,11 @@ msgstr "хориҷкунии миёнаи \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -939,7 +1044,12 @@ msgstr "...бозтанзимкунӣ бо нокомӣ анҷомид"
msgid "reconfiguration done"
msgstr "бозтанзимгузорӣ хотима ёфт"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "муҳити \"%s\" интихоб нашудааст"
@@ -1199,13 +1309,6 @@ msgstr ""
"\n"
"истифода:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - чопи ин пайғоми ёрӣ.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1237,12 +1340,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - дигар решаро барои коргузории rpm истифода баред.\n"
-#: ../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"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1618,14 +1715,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - тафтиш намоед, ки оё коргузории дуруст ба амал меояд.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - ба таври маҷбурӣ истифода баред, ҳатто агар якчанд "
-"барномаҳои коромода вуҷуд надошта бошад.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1725,30 +1814,6 @@ msgstr " (ҳ/Н) "
msgid "Removal failed"
msgstr "Хориҷкунӣ нагузашт"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\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 © 1999-2008 Mandriva.\n"
-"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
-"шавад.\n"
-"\n"
-"истифода:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --media - истифодаи танҳо муҳити додашуда, бо вергул ҷудошуда.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1756,14 +1821,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - барои аз нав намудани систем барномаҳои "
-"коромодаробеихтиёрона интихоб намуд.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1893,11 +1950,6 @@ msgstr ""
" вобастагиҳо ва бутунӣ барои пурсиши корван иҷозат дода "
"шавад.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - дигар решаро барои коргузории rpm истифода баред.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1984,24 +2036,6 @@ msgstr ""
" --bug - ба феҳрист ҳисобот оиди хатогиҳо бароред\n"
" бо далели зерин.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - пеш аз коргузорӣ намудан имзоро тафтиш намоед \n"
-" (--no-verify-rpm онро хомӯш намоед, дохил шудааст аз "
-"рӯипешфарз).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - тафтиш намоед, ки оё коргузории дуруст ба амал меояд.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2323,12 +2357,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "Бекор кардан"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "urpmi бозоғоз шуда истодааст"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Вақте, ки тайёр Enter-ро пахш кунед..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3091,9 +3125,6 @@ msgstr "Ягон номнависи тағиротҳо пайдо нагарди
#~ msgstr ""
#~ "муҳити бемуносибати \"%s\" ҳамчун ивазшаванда ишора шудааст, локиннодуруст"
-#~ msgid "Press Enter when ready..."
-#~ msgstr "Вақте, ки тайёр Enter-ро пахш кунед..."
-
#~ msgid " -c - clean headers cache directory.\n"
#~ msgstr " -c - феҳристи кэши сарлавҳаҳоро тоза намоед.\n"
diff --git a/po/th.po b/po/th.po
index d0972763..316fe4b0 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +89,86 @@ msgstr "_ยกเลิก"
msgid "Choose location to save file"
msgstr ""
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\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-2008 Mandriva.\n"
+"ซอฟท์แวร์นี่เป็นฟรีซอฟท์แวร์และแจกจ่ายภายใต้ระเบียบของ GNU GPL.\n"
+"\n"
+"วิธีใช้:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - เลือกแพ็คเกจที่ต้องการอัพเกรดอัตโนมัติ\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - บังคับ invocation ถึงแม้ว่าแพ็คเกจจะไม่มีอยู่\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - ตรวจสอบความถูกต้องของ rpm signature ก่อนการติดตั้ง\n"
+" (--no-verify-rpm disable it, default is enabled)\n"
+
+#: ../gurpmi.pm:52 ../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 - ใช้เพื่ออัพเดตมีเดีย\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, fuzzy, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --wget - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - ตรวจสอบว่าการติดตั้งสามารถทำได้ถูกต้องหรือไม่.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr " --media - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "ไม่มีการกำหนดคำสั่ง"
@@ -241,6 +320,11 @@ msgstr "install เสร็จเรียบร้อย"
msgid "removing %s"
msgstr "กำลังติดตั้ง %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, fuzzy, c-format
+msgid "restarting urpmi"
+msgstr "กำลังติดตั้ง $rpm\n"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -389,7 +473,14 @@ msgstr ""
msgid "Copying failed"
msgstr "ล็อกอินล้มเหลว"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "อุปกรณ์ \"%s\" ไม่ได้ถูกเลือก"
@@ -847,6 +938,11 @@ msgstr "กำลังทำการย้ายออกอุปกรณ์
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -900,7 +996,12 @@ msgstr "บัันทึกการตั้งค่าเมนูแล้
msgid "reconfiguration done"
msgstr "คอนฟิกเซอเวอร์"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "อุปกรณ์ \"%s\" ไม่ได้ถูกเลือก"
@@ -1158,13 +1259,6 @@ msgstr ""
"\n"
"วิธีใช้:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - พิมพ์ข้อความช่วย\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1193,11 +1287,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --wget - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
-#: ../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 - ใช้เพื่ออัพเดตมีเดีย\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, fuzzy, c-format
msgid ""
@@ -1556,12 +1645,6 @@ msgstr " --auto - ทำการเลือกแพ็คเกจ
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - ตรวจสอบว่าการติดตั้งสามารถทำได้ถูกต้องหรือไม่.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - บังคับ invocation ถึงแม้ว่าแพ็คเกจจะไม่มีอยู่\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1652,28 +1735,6 @@ msgstr " (y/N) "
msgid "Removal failed"
msgstr "ล็อกอินล้มเหลว"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\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-2008 Mandriva.\n"
-"ซอฟท์แวร์นี่เป็นฟรีซอฟท์แวร์และแจกจ่ายภายใต้ระเบียบของ GNU GPL.\n"
-"\n"
-"วิธีใช้:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --media - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1681,12 +1742,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - เลือกแพ็คเกจที่ต้องการอัพเกรดอัตโนมัติ\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1793,11 +1848,6 @@ msgstr ""
" --allow-force - ยอมให้ผู้ใช้สามารถติดตั้งแพ็คเกจโดยไม่จำเป็นต้อง\n"
" มีการตรวจสอบความเป็นอิสระและความถูกต้อง\n"
-#: ../urpmi:110 ../urpmq:68
-#, fuzzy, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --wget - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1878,22 +1928,6 @@ msgstr ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - ตรวจสอบความถูกต้องของ rpm signature ก่อนการติดตั้ง\n"
-" (--no-verify-rpm disable it, default is enabled)\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - ตรวจสอบว่าการติดตั้งสามารถทำได้ถูกต้องหรือไม่.\n"
-
#: ../urpmi:135
#, fuzzy, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2188,12 +2222,12 @@ msgstr[0] ""
msgid "Cancel"
msgstr "ยกเลิก"
-#: ../urpmi:665
+#: ../urpmi:635
#, fuzzy, c-format
-msgid "restarting urpmi"
-msgstr "กำลังติดตั้ง $rpm\n"
+msgid "Press Enter when mounted..."
+msgstr "กรุณากด enter เมื่อพร้อม"
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
@@ -2886,9 +2920,6 @@ 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"
diff --git a/po/tl.po b/po/tl.po
index da34db2b..bf46fe6f 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +106,97 @@ msgstr "_Cancel"
msgid "Choose location to save file"
msgstr "Piliin ang lugar kung saan ise-save ang file"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Ito ay libreng software at maaaring ipamahagi ayon sa mga nasasaad sa GNU "
+"GPL.\n"
+"\n"
+"paggamit:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - i-print itong tulong na mensahe.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - piliin kaagad ang mga package para i-upgrade ang "
+"sistema.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - pilitin ang imbokasyon kahit na wala ang ilang mga "
+"package.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - patotohanan ang rpm signature bago ang pag-i-install\n"
+" (--no-verify-rpm ay idi-disable ito, default ay "
+"gumagana).\n"
+
+#: ../gurpmi.pm:52 ../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 - gamitin lang ang binigay na media, hiniwilay ng comma/"
+"kuwit.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+" --root - gumamit ng ibang root para sa pag-i-install ng rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - subukan kung makakamit ng tama ang pag-i-install.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --media - gamitin lang ang binigay na media, hiniwilay ng comma/"
+"kuwit.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Walang command na nabanggit"
@@ -267,6 +357,11 @@ msgstr "Natapos na ang pag-install"
msgid "removing %s"
msgstr "inaalis ang %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "sinisimulan muli ang urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -419,7 +514,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Pagkokopya nabigo"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "medium na \"%s\" ay hindi nakapili"
@@ -883,6 +985,11 @@ msgstr "inaalis ang medium na \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -936,7 +1043,12 @@ msgstr "Configuration file"
msgid "reconfiguration done"
msgstr "Pagsasaayos ng Server"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medium na \"%s\" ay hindi nakapili"
@@ -1195,13 +1307,6 @@ msgstr ""
"\n"
"paggamit:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - i-print itong tulong na mensahe.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1234,13 +1339,6 @@ msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
" --root - gumamit ng ibang root para sa pag-i-install ng rpm.\n"
-#: ../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 - gamitin lang ang binigay na media, hiniwilay ng comma/"
-"kuwit.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1620,14 +1718,6 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - subukan kung makakamit ng tama ang pag-i-install.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - pilitin ang imbokasyon kahit na wala ang ilang mga "
-"package.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1730,31 +1820,6 @@ msgstr " (o/H) "
msgid "Removal failed"
msgstr "Pag-aalis nabigo"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Ito ay libreng software at maaaring ipamahagi ayon sa mga nasasaad sa GNU "
-"GPL.\n"
-"\n"
-"paggamit:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --media - gamitin lang ang binigay na media, hiniwilay ng comma/"
-"kuwit.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1762,14 +1827,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - piliin kaagad ang mga package para i-upgrade ang "
-"sistema.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1889,12 +1946,6 @@ msgstr ""
"package\n"
" na hindi sinusuri ang mga dependency at integridad.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-" --root - gumamit ng ibang root para sa pag-i-install ng rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1984,23 +2035,6 @@ msgstr ""
" --bug - maglabas ng ulat ng bug sa directory na binanggit ng\n"
" kasunod na argument.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - patotohanan ang rpm signature bago ang pag-i-install\n"
-" (--no-verify-rpm ay idi-disable ito, default ay "
-"gumagana).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - subukan kung makakamit ng tama ang pag-i-install.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2324,12 +2358,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr "I-cancel"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "sinisimulan muli ang urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Pindutin ang Enter kung handa na..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3104,9 +3138,6 @@ msgstr "Walang nahanap na changelog\n"
#~ 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"
diff --git a/po/tr.po b/po/tr.po
index 510577bd..3b623672 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +110,93 @@ msgstr "İp_tal"
msgid "Choose location to save file"
msgstr "Bir dosya seçin"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi sürüm %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Bu bir serbest yazılımdır ve GNU GPL lisansı altında tekrar "
+"dağıtılabilinir.\n"
+"\n"
+"kullanımı:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - bu yardım mesajını görüntüler.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - interaktif modu kapalı, sorulara varsayılan cevapları "
+"ver.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - Sistemi güncellemek için paketleri otomatik seç.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - bazı paketlerin bulunamama durumda bile işlemin\n"
+" devamına zorla.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - kurulumdan önce rpm imzasını doğrula\n"
+" (--no-verify-rpm bunu iptal eder, öntanımlı etkindir).\n"
+
+#: ../gurpmi.pm:52 ../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 - sadece belirtilen ortamları kullan (virgülle ayırın).\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, fuzzy, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --wget - uzaktaki dosyaları almak için wget kullan.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - kurulumun başarılı olup olmayacağını doğrula.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --media - sadece belirtilen ortamları kullan (virgülle ayırın).\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Komut belirtmemişsiniz"
@@ -268,6 +354,11 @@ msgstr "Kurulum tamamlandı"
msgid "removing %s"
msgstr "%s kaldırılıyor"
+#: ../gurpmi2:334 ../urpmi:677
+#, fuzzy, c-format
+msgid "restarting urpmi"
+msgstr "slurpd başlatılıyor: "
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -421,7 +512,14 @@ msgstr "Çok fazla parametre\n"
msgid "Copying failed"
msgstr "Kopyalama başarısız"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "\"%s\" seçilmedi"
@@ -882,6 +980,11 @@ msgid "adding medium \"%s\""
msgstr "aygıt kaldırılıyor \"%s\""
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "Ortam değişkenleri dizini %s mevcut değilt"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "bu konum herhangi bir dağıtım içermiyor"
@@ -936,7 +1039,12 @@ msgstr "Yapılandırma dosyası"
msgid "reconfiguration done"
msgstr "Sunucu Ayarları"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" seçilmedi"
@@ -1195,13 +1303,6 @@ msgstr ""
"\n"
"kullanımı:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - bu yardım mesajını görüntüler.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1232,12 +1333,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --wget - uzaktaki dosyaları almak için wget kullan.\n"
-#: ../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 - sadece belirtilen ortamları kullan (virgülle ayırın).\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, fuzzy, c-format
msgid ""
@@ -1607,14 +1702,6 @@ msgstr " --auto - Otomatik seçenekler arasından paketleri seç.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - kurulumun başarılı olup olmayacağını doğrula.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - bazı paketlerin bulunamama durumda bile işlemin\n"
-" devamına zorla.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1707,30 +1794,6 @@ msgstr " ( y, e / H , N ) "
msgid "Removal failed"
msgstr "Kaldırma başarısız"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi sürüm %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Bu bir serbest yazılımdır ve GNU GPL lisansı altında tekrar "
-"dağıtılabilinir.\n"
-"\n"
-"kullanımı:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --media - sadece belirtilen ortamları kullan (virgülle ayırın).\n"
-
#: ../urpmi:81
#, fuzzy, c-format
msgid ""
@@ -1740,12 +1803,6 @@ msgstr ""
" --auto - interaktif modu kapalı, sorulara varsayılan cevapları "
"ver.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - Sistemi güncellemek için paketleri otomatik seç.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1854,11 +1911,6 @@ msgstr ""
" --allow-force - kullanıcıya bağımlılıkları ve diğer olumsuzlukları\n"
" sormadan kuruluma izin verir.\n"
-#: ../urpmi:110 ../urpmq:68
-#, fuzzy, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --wget - uzaktaki dosyaları almak için wget kullan.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1940,22 +1992,6 @@ msgstr ""
" --bug - sonraki argüman tarafından belirtilen dizini bir\n"
" hata raporu oluştur.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - kurulumdan önce rpm imzasını doğrula\n"
-" (--no-verify-rpm bunu iptal eder, öntanımlı etkindir).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - kurulumun başarılı olup olmayacağını doğrula.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2266,12 +2302,12 @@ msgstr[0] ""
msgid "Cancel"
msgstr "İptal"
-#: ../urpmi:665
+#: ../urpmi:635
#, fuzzy, c-format
-msgid "restarting urpmi"
-msgstr "slurpd başlatılıyor: "
+msgid "Press Enter when mounted..."
+msgstr "Hazır olduğunuzda Enter'a basın..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3011,9 +3047,6 @@ msgstr "Görüntü (imaj) bulunamadı!\n"
#~ 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"
diff --git a/po/uk.po b/po/uk.po
index c877596e..99fd5918 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +107,93 @@ msgstr "_C Скасувати"
msgid "Choose location to save file"
msgstr "Виберіть місце для збереження файла"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"версія urpmi %s\n"
+" Авторські права © 1999-2008 Mandriva.\n"
+" Це безкоштовна програма, може розповсюджуватися за умовами GNU GPL.\n"
+"\n"
+"використання:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - автоматично вибрати пакунки для поновлення системи.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - примусово виконати, навіть якщо деяких пакунків не "
+"існує.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - перевірити підпис rpm перед встановленням\n"
+" (--no-verify-rpm вимикає це і встановлює типове "
+"значення).\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - використовувати інший root для встановлення rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - перевірити, чи дане встановлення можливе.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - використовувати тільки задані носії для пошуку запитаних "
+"(або поновлюваних) пакунків.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Не вибрано пакунків"
@@ -266,6 +352,11 @@ msgstr "Встановлення завершено"
msgid "removing %s"
msgstr "вилучається %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "перезапуск urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -416,7 +507,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Копіювання невдале"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "носія \"%s\" не вибрано"
@@ -882,6 +980,11 @@ msgstr "видаляється носій \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -935,7 +1038,12 @@ msgstr "...переконфігурація невдала"
msgid "reconfiguration done"
msgstr "переконфігурацію виконано"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "Помилка при створенні файла назв: залежність %d не знайдено"
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "носія \"%s\" не вибрано"
@@ -1194,13 +1302,6 @@ msgstr ""
"\n"
"використання:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - виводити цю довідку.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1232,12 +1333,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - використовувати інший root для встановлення rpm.\n"
-#: ../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"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1605,14 +1700,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - перевірити, чи є коректний доступ до змінного пристрою.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - примусово виконати, навіть якщо деяких пакунків не "
-"існує.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1714,30 +1801,6 @@ msgstr " (Т/н) "
msgid "Removal failed"
msgstr "Видалення невдале"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"версія urpmi %s\n"
-" Авторські права © 1999-2008 Mandriva.\n"
-" Це безкоштовна програма, може розповсюджуватися за умовами GNU GPL.\n"
-"\n"
-"використання:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - використовувати тільки задані носії для пошуку запитаних "
-"(або поновлюваних) пакунків.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1745,13 +1808,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - автоматично вибрати пакунки для поновлення системи.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1869,11 +1925,6 @@ msgstr ""
" --allow-force - дозволити користувачеві встановлювати пакунки без "
"перевірки залежностей і цілісності.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - використовувати інший root для встановлення rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1957,23 +2008,6 @@ msgstr ""
" --bug - вивести звіт про помилку в теку, вказану наступним "
"аргументом.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - перевірити підпис rpm перед встановленням\n"
-" (--no-verify-rpm вимикає це і встановлює типове "
-"значення).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - перевірити, чи дане встановлення можливе.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2295,12 +2329,12 @@ msgstr[2] ""
msgid "Cancel"
msgstr "Скасувати"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "перезапуск urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Натисніть Enter, коли будете готові..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3056,18 +3090,12 @@ msgstr "Не знайдено журналу змін\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)"
diff --git a/po/urpmi.pot b/po/urpmi.pot
index dff2f662..a4bcdb9c 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +82,79 @@ msgstr ""
msgid "Choose location to save file"
msgstr ""
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 ""
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:75 ../urpmq:47
+#, c-format
+msgid " --media - use only the given media, separated by comma.\n"
+msgstr ""
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr ""
@@ -231,6 +303,11 @@ msgstr ""
msgid "removing %s"
msgstr ""
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr ""
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -379,7 +456,14 @@ msgstr ""
msgid "Copying failed"
msgstr ""
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr ""
@@ -838,6 +922,11 @@ msgstr ""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -891,7 +980,12 @@ msgstr ""
msgid "reconfiguration done"
msgstr ""
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr ""
@@ -1144,13 +1238,6 @@ msgid ""
"usage: urpmf [options] pattern-expression\n"
msgstr ""
-#: ../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 ""
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1179,11 +1266,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
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 ""
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1537,12 +1619,6 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1635,23 +1711,6 @@ msgstr ""
msgid "Removal failed"
msgstr ""
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1659,12 +1718,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1767,11 +1820,6 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1844,20 +1892,6 @@ msgid ""
" next arg.\n"
msgstr ""
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2145,12 +2179,12 @@ msgstr[1] ""
msgid "Cancel"
msgstr ""
-#: ../urpmi:665
+#: ../urpmi:635
#, c-format
-msgid "restarting urpmi"
+msgid "Press Enter when mounted..."
msgstr ""
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
diff --git a/po/uz.po b/po/uz.po
index 5d20d4c1..8b949178 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +96,91 @@ msgstr "_Bekor qilish"
msgid "Choose location to save file"
msgstr "Faylni qaerga saqlash joyini tanlang"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi, versiya %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
+"\n"
+"Foydalanish:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - shu yordam xabarini ko'rsatish.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - tizimni yangilash uchun paketlarni avto-tanlash.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - o'rnatishdan avval paketning elektron imzosini "
+"tekshirish\n"
+" (--no-verify-rpm ushbu amalning teskarisi, andoza "
+"bo'yicha paketning elektron imzosi tekshiriladi).\n"
+
+#: ../gurpmi.pm:52 ../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 - faqat ko'rsatilgan, vergul bilan ajratilgan, "
+"to'plamlardan foydalanish.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - o'rnatishni to'g'ri bajarish imkoniyatini tekshirish.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Hech qanday paket ko'rsatilmagan"
@@ -253,6 +337,11 @@ msgstr "O'rnatish tugadi"
msgid "removing %s"
msgstr "%s o'chirilmoqda"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "urpmi qaytadan ishga tushmoqda"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -405,7 +494,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Nusxa ko'chirish muvaffaqiyatsiz tugadi"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr ""
@@ -868,6 +964,11 @@ msgid "adding medium \"%s\""
msgstr "to'plam qo'shilmoqda: %s"
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "chroot direktoriyasi mavjud emas"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -922,7 +1023,12 @@ msgstr "...qaytadan moslash muvaffaqiyatsiz tugadi"
msgid "reconfiguration done"
msgstr "...qaytadan moslash tugadi"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "to'plamni yangilash hojati yo'q: \"%s\""
@@ -1183,13 +1289,6 @@ msgstr ""
"\n"
"Foydalanish: urpmf [parametrlar] qidirish uchun ifoda\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - shu yordam xabarini ko'rsatish.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1220,13 +1319,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
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 - faqat ko'rsatilgan, vergul bilan ajratilgan, "
-"to'plamlardan foydalanish.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1587,12 +1679,6 @@ msgstr ""
" --test - olib tashlashni to'g'ri bajarish imkoniyatini "
"tekshirish.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1684,28 +1770,6 @@ msgstr " (h/Y) "
msgid "Removal failed"
msgstr "O'chirish muvaffaqiyatsiz tugadi"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi, versiya %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
-"\n"
-"Foydalanish:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1713,12 +1777,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - tizimni yangilash uchun paketlarni avto-tanlash.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1821,11 +1879,6 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1898,25 +1951,6 @@ msgid ""
" next arg.\n"
msgstr ""
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - o'rnatishdan avval paketning elektron imzosini "
-"tekshirish\n"
-" (--no-verify-rpm ushbu amalning teskarisi, andoza "
-"bo'yicha paketning elektron imzosi tekshiriladi).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - o'rnatishni to'g'ri bajarish imkoniyatini tekshirish.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2231,12 +2265,12 @@ msgstr[0] "%d-ta paketni o'rnatish bilan davom etishni istaysizmi?"
msgid "Cancel"
msgstr "Bekor qilish"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "urpmi qaytadan ishga tushmoqda"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Tayyor bo'lganda ENTER tugmasini bosing..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -2928,9 +2962,6 @@ 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"
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 311a38dc..07afb439 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +96,89 @@ msgstr "_Бекор қилиш"
msgid "Choose location to save file"
msgstr "Файлни қаерга сақлаш жойини танланг"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\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-2008 Mandriva.\n"
+"Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
+"\n"
+"Фойдаланиш:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - тизимни янгилаш учун пакетларни авто-танлаш.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - ўрнатишдан аввал пакетнинг электрон имзосини текшириш\n"
+" (--no-verify-rpm ушбу амалнинг тескариси, андоза бўйича "
+"пакетнинг электрон имзоси текширилади).\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr ""
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - ўрнатишни тўғри бажариш имкониятини текшириш.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Ҳеч қандай пакет кўрсатилмаган"
@@ -253,6 +335,11 @@ msgstr "Ўрнатиш тугади"
msgid "removing %s"
msgstr "%s ўчирилмоқда"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "urpmi қайтадан ишга тушмоқда"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -405,7 +492,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Нусха кўчириш муваффақиятсиз тугади"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr ""
@@ -866,6 +960,11 @@ msgid "adding medium \"%s\""
msgstr "тўплам қўшилмоқда: %s"
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "chroot директорияси мавжуд эмас"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -920,7 +1019,12 @@ msgstr "...қайтадан мослаш муваффақиятсиз тугад
msgid "reconfiguration done"
msgstr "...қайтадан мослаш тугади"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "тўпламни янгилаш ҳожати йўқ: \"%s\""
@@ -1179,13 +1283,6 @@ msgstr ""
"\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - шу ёрдам хабарини кўрсатиш.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1216,13 +1313,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
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 - фақат кўрсатилган, вергул билан ажратилган, тўпламлардан "
-"фойдаланиш.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1581,12 +1671,6 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - олиб ташлашни тўғри бажариш имкониятини текшириш.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1677,28 +1761,6 @@ msgstr " (ҳ/Й) "
msgid "Removal failed"
msgstr "Ўчириш муваффақиятсиз тугади"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\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-2008 Mandriva.\n"
-"Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
-"\n"
-"Фойдаланиш:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1706,12 +1768,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - тизимни янгилаш учун пакетларни авто-танлаш.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1814,11 +1870,6 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr ""
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr ""
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1891,23 +1942,6 @@ msgid ""
" next arg.\n"
msgstr ""
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - ўрнатишдан аввал пакетнинг электрон имзосини текшириш\n"
-" (--no-verify-rpm ушбу амалнинг тескариси, андоза бўйича "
-"пакетнинг электрон имзоси текширилади).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - ўрнатишни тўғри бажариш имкониятини текшириш.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2222,12 +2256,12 @@ msgstr[0] "%d-та пакетни ўрнатиш билан давом этиш
msgid "Cancel"
msgstr "Бекор қилиш"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "urpmi қайтадан ишга тушмоқда"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Тайёр бўлганда ENTER тугмасини босинг..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -2916,9 +2950,6 @@ 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"
diff --git a/po/vi.po b/po/vi.po
index a45dbbc3..73a8ea8a 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +101,92 @@ msgstr "Bỏ _qua"
msgid "Choose location to save file"
msgstr "Chọn nơi lưu tập tin"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"Phiên bản urpmi %s\n"
+"Bản quyền (C) 1999-2008 Mandriva.\n"
+"Đây là phần mềm miễn phí và có thể phân phối lại theo các điều khoản của GNU "
+"GPL.\n"
+"\n"
+"Cách dùng:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - in thông tin trợ giúp này.\n"
+
+#: ../gurpmi.pm:47
+#, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - tự động chọn các gói tin để nâng cấp hệ thống.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - ép buộc cầu viện ngay cả khi một số gói tin không tồn "
+"tại.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, fuzzy, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - xác minh chữ ký rpm trước khi cài đặt.\n"
+" (--no-verify-rpm để tắt nó, mặc định là bật).\n"
+
+#: ../gurpmi.pm:52 ../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 - chỉ dùng phương tiện được trao, ngăn cách bởi dấu phẩy.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - dùng root khác để thực hiện cài đặt rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, fuzzy, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - xác minh nếu việc cài đặt đạt kết quả tốt.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, fuzzy, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - chỉ dùng phương tiện được cho để tìm kiếm hay nâng cấp "
+"các gói.\n"
+
+#: ../gurpmi.pm:98
#, fuzzy, c-format
msgid "No packages specified"
msgstr "không có gói tin với tên %s"
@@ -258,6 +343,11 @@ msgstr "Kết thúc cài đặt"
msgid "removing %s"
msgstr "gỡ bỏ %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "khởi chạy lại urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -408,7 +498,14 @@ msgstr ""
msgid "Copying failed"
msgstr "Sao chép không được"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "phương tiện \"%s\" không được chọn"
@@ -870,6 +967,11 @@ msgstr "gỡ bỏ phương tiện \"%s\""
#: ../urpm/media.pm:759
#, c-format
+msgid "directory %s does not exist"
+msgstr ""
+
+#: ../urpm/media.pm:767
+#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
@@ -924,7 +1026,12 @@ msgstr "...không cấu hình lại được"
msgid "reconfiguration done"
msgstr "hoàn thành việc cấu hình lại"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "phương tiện \"%s\" không được chọn"
@@ -1187,13 +1294,6 @@ msgstr ""
"\n"
"Cách dùng:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - in thông tin trợ giúp này.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
@@ -1224,12 +1324,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - dùng root khác để thực hiện cài đặt rpm.\n"
-#: ../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 - chỉ dùng phương tiện được trao, ngăn cách bởi dấu phẩy.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1596,14 +1690,6 @@ msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr ""
" --test - xác minh nếu việc gỡ bỏ có thể được lưu trữ chính xác.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - ép buộc cầu viện ngay cả khi một số gói tin không tồn "
-"tại.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1696,31 +1782,6 @@ msgstr " (Có/Không) "
msgid "Removal failed"
msgstr "Gỡ bỏ không được"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"Phiên bản urpmi %s\n"
-"Bản quyền (C) 1999-2008 Mandriva.\n"
-"Đây là phần mềm miễn phí và có thể phân phối lại theo các điều khoản của GNU "
-"GPL.\n"
-"\n"
-"Cách dùng:\n"
-
-#: ../urpmi:78
-#, fuzzy, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - chỉ dùng phương tiện được cho để tìm kiếm hay nâng cấp "
-"các gói.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1728,12 +1789,6 @@ msgid ""
"questions.\n"
msgstr ""
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - tự động chọn các gói tin để nâng cấp hệ thống.\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1848,11 +1903,6 @@ msgstr ""
" --allow-force - cho phép hỏi người dùng cài đặt các gói tin mà\n"
" không kiểm tra các phụ thuộc và tính toàn vẹn.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - dùng root khác để thực hiện cài đặt rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1936,22 +1986,6 @@ msgstr ""
" --bug - xuất ra báo cáo lỗi trong thư mục được chỉ định\n"
" bởi đối số (arg) tiếp theo.\n"
-#: ../urpmi:132
-#, fuzzy, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - xác minh chữ ký rpm trước khi cài đặt.\n"
-" (--no-verify-rpm để tắt nó, mặc định là bật).\n"
-
-#: ../urpmi:134
-#, fuzzy, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - xác minh nếu việc cài đặt đạt kết quả tốt.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2269,12 +2303,12 @@ msgstr[0] ""
msgid "Cancel"
msgstr "Bỏ qua"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "khởi chạy lại urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Nhấn Enter khi sẵn sàng ..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3026,9 +3060,6 @@ msgstr "Không thấy changelog\n"
#~ "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"
diff --git a/po/wa.po b/po/wa.po
index 4ced9ca8..51270b31 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +108,97 @@ msgstr "_Rinoncî"
msgid "Choose location to save file"
msgstr "Tchoezixhoz l' plaece wice schaper l' fitchî"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi modêye %s\n"
+"Copyright © 1999-2008 Mandriva.\n"
+"Çouci est on libe programe et pout esse cossemé so les termes del licince "
+"GPL.\n"
+"\n"
+"Po s' è siervi:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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 - mostere ci messaedje d' aidance chal.\n"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr ""
+" --auto - môde nén eteractif, supôze li prémetowe valixhance po "
+"totes les kesses.\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr ""
+" --auto-select - tchoezi otomaticmint les pacaedjes pol metaedje a djoû\n"
+" do sistinme.\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - foirci, minme si des pacaedjes k' i gn a n' egzistèt "
+"nén.\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - verifyî li sinateure rpm divant d' astaler.\n"
+" (--no-verify-rpm po n' nén l' fé, prémetou=verifyî).\n"
+
+#: ../gurpmi.pm:52 ../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 - eployî rén k' les sopoirts dinés, separés pa des comas.\n"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - eployî ene ôte raecene po l' astalaedje des rpm.\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+" --test - verifyî si l' astalaedje si pout fé comifåt disk' al "
+"fén.\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr ""
+" --searchmedia - eployî rén k' les sopoirts dinés po cweri les pacaedjes.\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "Nou pacaedje di scpecifyî"
@@ -267,6 +357,11 @@ msgstr "L' astalåcion a fini"
msgid "removing %s"
msgstr "dji oistêye li pacaedje %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "renondant urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -418,7 +513,14 @@ msgstr "Pår trop d' årgumints\n"
msgid "Copying failed"
msgstr "Li copiaedje a fwait berwete"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "li sopoirt «%s» n' est nén disponibe"
@@ -884,6 +986,11 @@ msgid "adding medium \"%s\""
msgstr "radjoutaedje do sopoirt «%s»"
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "li ridant po candjî d' raecene (chroot) n' egzistêye nén"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "i shonne ki cist eplaeçmint la n' a nole distribucion"
@@ -940,7 +1047,12 @@ msgstr "...li rapontiaedje a fwait berwete"
msgid "reconfiguration done"
msgstr "li rapontiaedje a stî fwait"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "li sopoirt «%s» est a djoû"
@@ -1203,13 +1315,6 @@ msgstr ""
"\n"
"Po s' è siervi: urpmf [tchuzes] erîlêye-ratourneure\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - mostere ci messaedje d' aidance chal.\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1242,12 +1347,6 @@ msgstr ""
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --urpmi-root - eployî ene ôte raecene po l' astalaedje des rpm.\n"
-#: ../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 - eployî rén k' les sopoirts dinés, separés pa des comas.\n"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1625,14 +1724,6 @@ msgstr ""
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - verifyî si l' oistaedje si pout fé comifåt.\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr ""
-" --force - foirci, minme si des pacaedjes k' i gn a n' egzistèt "
-"nén.\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1735,30 +1826,6 @@ msgstr " (o/N) "
msgid "Removal failed"
msgstr "Li oistaedje a fwait berwete"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi modêye %s\n"
-"Copyright © 1999-2008 Mandriva.\n"
-"Çouci est on libe programe et pout esse cossemé so les termes del licince "
-"GPL.\n"
-"\n"
-"Po s' è siervi:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr ""
-" --searchmedia - eployî rén k' les sopoirts dinés po cweri les pacaedjes.\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1768,14 +1835,6 @@ msgstr ""
" --auto - môde nén eteractif, supôze li prémetowe valixhance po "
"totes les kesses.\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr ""
-" --auto-select - tchoezi otomaticmint les pacaedjes pol metaedje a djoû\n"
-" do sistinme.\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1894,11 +1953,6 @@ msgstr ""
" les pacaedjes sins verifyî les aloyances nerén\n"
" l' etegrité.\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - eployî ene ôte raecene po l' astalaedje des rpm.\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1985,24 +2039,6 @@ msgstr ""
" --bug - sicrire on rapoirt di bug dins l' ridant dné come\n"
" årgumint djusse après.\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - verifyî li sinateure rpm divant d' astaler.\n"
-" (--no-verify-rpm po n' nén l' fé, prémetou=verifyî).\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr ""
-" --test - verifyî si l' astalaedje si pout fé comifåt disk' al "
-"fén.\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2332,12 +2368,12 @@ msgstr[1] "Continouwer avou l' astalaedje d' on pacaedje? (%d Mo)"
msgid "Cancel"
msgstr "Rinoncî"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "renondant urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "Tapez so «enter» cwand c' est fwait..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -3104,9 +3140,6 @@ msgstr "Nou djournå des candjmints di trové\n"
#~ 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"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ecd7be2c..8657a478 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +109,86 @@ msgstr "取消(_C)"
msgid "Choose location to save file"
msgstr "选择保存文件的位置"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmi 版本 %s\n"
+"版权 (C) 1999-2008 Mandriva。\n"
+"这是自由软件,可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr " --auto - 非交互模式,对全部问题假定默认回答。\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - 自动选择升级系统的软件包。\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - 强制执行, 即使某些软件包并不存在。\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - 安装之前验证 rpm 签署\n"
+" (--no-verify-rpm 禁止它,默认是激活的)。\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - 使用另一个 root 安装 rpm。\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - 验证安装是否可以正确进行。\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr " --searchmedia - 只使用给定介质来搜索所请求的软件包。\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "未指定软件包"
@@ -266,6 +345,11 @@ msgstr "安装完成"
msgid "removing %s"
msgstr "正在删除 %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "重新启动 urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -416,7 +500,14 @@ msgstr "参数太多\n"
msgid "Copying failed"
msgstr "复制失败"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "介质“%s”不可用"
@@ -742,7 +833,9 @@ msgstr "出错"
msgid ""
"Installation failed, bad rpms:\n"
"%s"
-msgstr "安装失败,rpm 有问题:\n%s"
+msgstr ""
+"安装失败,rpm 有问题:\n"
+"%s"
#: ../urpm/main_loop.pm:270
#, c-format
@@ -875,6 +968,11 @@ msgid "adding medium \"%s\""
msgstr "添加介质“%s”"
#: ../urpm/media.pm:759
+#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "环境目录 %s 不存在"
+
+#: ../urpm/media.pm:767
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "此位置似乎不包含任何发行版"
@@ -929,7 +1027,12 @@ msgstr "...重新配置失败"
msgid "reconfiguration done"
msgstr "重新配置完成"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr ""
+
+#: ../urpm/media.pm:1074
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "介质“%s”已为最新"
@@ -1187,13 +1290,6 @@ msgstr ""
"\n"
"用法:\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - 打印帮助信息。\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1222,11 +1318,6 @@ msgstr " --literal, -l - 不匹配模式,参数为字面字符串。\n"
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --urpmi-root - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
-#: ../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"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1585,12 +1676,6 @@ msgstr " --auto - 自动选中软件包。\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - 验证删除是否可以正确进行。\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - 强制执行, 即使某些软件包并不存在。\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1683,28 +1768,6 @@ msgstr "(是(y)/否(N))[否]"
msgid "Removal failed"
msgstr "删除失败"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi 版本 %s\n"
-"版权 (C) 1999-2008 Mandriva。\n"
-"这是自由软件,可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - 只使用给定介质来搜索所请求的软件包。\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1712,12 +1775,6 @@ msgid ""
"questions.\n"
msgstr " --auto - 非交互模式,对全部问题假定默认回答。\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - 自动选择升级系统的软件包。\n"
-
#: ../urpmi:83
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1823,11 +1880,6 @@ msgid ""
" dependencies checking and integrity.\n"
msgstr " --allow-force - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - 使用另一个 root 安装 rpm。\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1910,22 +1962,6 @@ msgstr ""
" --bug - 输出故障报告\n"
" 下一个参数指定输出目录。\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - 安装之前验证 rpm 签署\n"
-" (--no-verify-rpm 禁止它,默认是激活的)。\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - 验证安装是否可以正确进行。\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2030,8 +2066,7 @@ msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr ""
-"请使用 --buildrequires 或 --install-src,默认为 --buildrequires"
+msgstr "请使用 --buildrequires 或 --install-src,默认为 --buildrequires"
#: ../urpmi:241
#, c-format
@@ -2236,12 +2271,12 @@ msgstr[0] "继续安装 %d 个软件包吗?"
msgid "Cancel"
msgstr "取消"
-#: ../urpmi:665
+#: ../urpmi:635
#, c-format
-msgid "restarting urpmi"
-msgstr "重新启动 urpmi"
+msgid "Press Enter when mounted..."
+msgstr ""
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, c-format
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 30fbeeb9..40f8e64a 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-03-03 18:01+0100\n"
+"POT-Creation-Date: 2008-03-13 15:02+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,7 +118,86 @@ msgstr "取消 (_C)"
msgid "Choose location to save file"
msgstr "選擇存檔的位置"
-#: ../gurpmi.pm:86
+#: ../gurpmi.pm:39 ../urpmi:69
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\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-2008 Mandriva。\n"
+"這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
+"\n"
+"用法:\n"
+
+#: ../gurpmi.pm:45
+#, c-format
+msgid "Options :"
+msgstr ""
+
+#: ../gurpmi.pm:46 ../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"
+
+#: ../gurpmi.pm:47
+#, fuzzy, c-format
+msgid ""
+" --auto - non-interactive mode, assume default answers to "
+"questions. --auto\n"
+msgstr " --auto - 非互動式模式,對問題使用預設的回答。\n"
+
+#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52
+#, c-format
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
+msgstr " --auto-select - 自動選擇要用來升級系統的套件。\n"
+
+#: ../gurpmi.pm:49 ../urpme:48 ../urpmi:104 ../urpmq:65
+#, c-format
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr " --force - 即使某些套件不存在仍然強制執行。\n"
+
+#: ../gurpmi.pm:50 ../urpmi:132
+#, c-format
+msgid ""
+" --verify-rpm - verify rpm signature before installation\n"
+" (--no-verify-rpm disables it, default is enabled).\n"
+msgstr ""
+" --verify-rpm - 安裝前檢驗 RPM 檔案的簽章。\n"
+" (--no-verify-rpm 會停用它,預設值為啟用)。\n"
+
+#: ../gurpmi.pm:52 ../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"
+
+#: ../gurpmi.pm:53 ../urpmi:110 ../urpmq:68
+#, c-format
+msgid " --root - use another root for rpm installation.\n"
+msgstr " --root - 使用另一個根目錄進行 RPM 套件的安裝。\n"
+
+#: ../gurpmi.pm:54 ../urpmi:134
+#, c-format
+msgid ""
+" --test - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr " --test - 僅確認安裝是否能夠正確完成。\n"
+
+#: ../gurpmi.pm:55 ../urpmi:78
+#, c-format
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
+msgstr " --searchmedia - 只使用指定的媒體來搜尋需要的套件。\n"
+
+#: ../gurpmi.pm:98
#, c-format
msgid "No packages specified"
msgstr "未指定套件"
@@ -275,6 +354,11 @@ msgstr "安裝完畢"
msgid "removing %s"
msgstr "正在移除 %s"
+#: ../gurpmi2:334 ../urpmi:677
+#, c-format
+msgid "restarting urpmi"
+msgstr "正在重新啟動 urpmi"
+
#: ../rpm-find-leaves:14
#, c-format
msgid ""
@@ -425,7 +509,14 @@ msgstr "參數太多\n"
msgid "Copying failed"
msgstr "複製失敗"
-#: ../urpm/cdrom.pm:160 ../urpm/cdrom.pm:165
+#: ../urpm/cdrom.pm:66
+#, c-format
+msgid ""
+"You must mount cdrom yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, fuzzy, c-format
msgid "medium \"%s\" is not available"
msgstr "媒體 \"%s\" 沒有被選取"
@@ -885,6 +976,11 @@ msgstr "移除媒體 \"%s\""
#: ../urpm/media.pm:759
#, fuzzy, c-format
+msgid "directory %s does not exist"
+msgstr "環境目錄 %s 不存在"
+
+#: ../urpm/media.pm:767
+#, fuzzy, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "這個 url 看起來並沒有包含任何散佈套件"
@@ -938,7 +1034,12 @@ msgstr "重新設定失敗"
msgid "reconfiguration done"
msgstr "重新設定完成"
-#: ../urpm/media.pm:1044
+#: ../urpm/media.pm:1053
+#, c-format
+msgid "Error generating names file: dependency %d not found"
+msgstr "生成名稱檔案時發生錯誤:相依性 %d 沒有找到"
+
+#: ../urpm/media.pm:1074
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "媒體 \"%s\" 沒有被選取"
@@ -1196,13 +1297,6 @@ msgstr ""
"\n"
"用法:urpmf [選項] pattern-expression\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
-#, c-format
-msgid " --help - print this help message.\n"
-msgstr " --help - 顯示此說明訊息。\n"
-
#: ../urpm/search.pm:36 ../urpmf:36
#, c-format
msgid " --version - print this tool's version number.\n"
@@ -1231,11 +1325,6 @@ msgstr " --literal, -l - 不比對樣版,把參數當作一般字串。\n"
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - 使用另一個根目錄進行 RPM 套件的安裝。\n"
-#: ../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"
-
#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:79 ../urpmq:50
#, c-format
msgid ""
@@ -1598,12 +1687,6 @@ msgstr " --auto - 自動選擇套件。\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - 確認刪除是否能夠正確進行。\n"
-#: ../urpme:48 ../urpmi:104 ../urpmq:65
-#, c-format
-msgid ""
-" --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - 即使某些套件不存在仍然強制執行。\n"
-
#: ../urpme:49 ../urpmi:109 ../urpmq:67
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
@@ -1696,28 +1779,6 @@ msgstr " (y/N) (是/否) "
msgid "Removal failed"
msgstr "移除失敗"
-#: ../urpmi:69
-#, c-format
-msgid ""
-"urpmi version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\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-2008 Mandriva。\n"
-"這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
-"\n"
-"用法:\n"
-
-#: ../urpmi:78
-#, c-format
-msgid ""
-" --searchmedia - use only the given media to search requested packages.\n"
-msgstr " --searchmedia - 只使用指定的媒體來搜尋需要的套件。\n"
-
#: ../urpmi:81
#, c-format
msgid ""
@@ -1725,12 +1786,6 @@ msgid ""
"questions.\n"
msgstr " --auto - 非互動式模式,對問題使用預設的回答。\n"
-#: ../urpmi:82 ../urpmq:52
-#, c-format
-msgid ""
-" --auto-select - automatically select packages to upgrade the system.\n"
-msgstr " --auto-select - 自動選擇要用來升級系統的套件。\n"
-
#: ../urpmi:83
#, fuzzy, c-format
msgid " --auto-update - update media then upgrade the system.\n"
@@ -1842,11 +1897,6 @@ msgstr ""
" --allow-force - 允許要求使用者安裝套件而不檢查相依性與完整\n"
" 性。\n"
-#: ../urpmi:110 ../urpmq:68
-#, c-format
-msgid " --root - use another root for rpm installation.\n"
-msgstr " --root - 使用另一個根目錄進行 RPM 套件的安裝。\n"
-
#: ../urpmi:112
#, c-format
msgid ""
@@ -1927,22 +1977,6 @@ msgid ""
" next arg.\n"
msgstr " --bug - 輸出臭蟲回報到下一個參數所指定的目錄。\n"
-#: ../urpmi:132
-#, c-format
-msgid ""
-" --verify-rpm - verify rpm signature before installation\n"
-" (--no-verify-rpm disables it, default is enabled).\n"
-msgstr ""
-" --verify-rpm - 安裝前檢驗 RPM 檔案的簽章。\n"
-" (--no-verify-rpm 會停用它,預設值為啟用)。\n"
-
-#: ../urpmi:134
-#, c-format
-msgid ""
-" --test - only verify if the installation can be achieved "
-"correctly.\n"
-msgstr " --test - 僅確認安裝是否能夠正確完成。\n"
-
#: ../urpmi:135
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
@@ -2252,12 +2286,12 @@ msgstr[0] "繼續安裝這 %d 個套件?"
msgid "Cancel"
msgstr "取消"
-#: ../urpmi:665
-#, c-format
-msgid "restarting urpmi"
-msgstr "正在重新啟動 urpmi"
+#: ../urpmi:635
+#, fuzzy, c-format
+msgid "Press Enter when mounted..."
+msgstr "準備好時請按 Enter..."
-#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
+#. -PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated!
#. -PO: neither the ``with''. Only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
#, fuzzy, c-format
@@ -2981,18 +3015,12 @@ msgstr "沒有找到更新紀錄\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)"