summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/Makefile2
-rw-r--r--po/af.po234
-rw-r--r--po/ar.po186
-rw-r--r--po/az.po271
-rw-r--r--po/bg.po279
-rw-r--r--po/bs.po235
-rw-r--r--po/ca.po291
-rw-r--r--po/cs.po269
-rw-r--r--po/cy.po267
-rw-r--r--po/da.po276
-rw-r--r--po/de.po293
-rw-r--r--po/el.po268
-rw-r--r--po/eo.po265
-rw-r--r--po/es.po285
-rw-r--r--po/et.po188
-rw-r--r--po/eu.po292
-rw-r--r--po/fi.po197
-rw-r--r--po/fr.po290
-rw-r--r--po/ga.po234
-rw-r--r--po/gl.po234
-rw-r--r--po/hr.po273
-rw-r--r--po/hu.po285
-rw-r--r--po/id.po270
-rw-r--r--po/is.po234
-rw-r--r--po/it.po280
-rw-r--r--po/ja.po234
-rw-r--r--po/ka.po234
-rw-r--r--po/ko.po234
-rw-r--r--po/lt.po234
-rw-r--r--po/lv.po262
-rw-r--r--po/ms.po271
-rw-r--r--po/mt.po276
-rw-r--r--po/nl.po273
-rw-r--r--po/no.po274
-rw-r--r--po/pl.po270
-rw-r--r--po/pt.po287
-rw-r--r--po/pt_BR.po275
-rw-r--r--po/ro.po275
-rw-r--r--po/ru.po286
-rw-r--r--po/sk.po264
-rw-r--r--po/sp.po273
-rw-r--r--po/sq.po278
-rw-r--r--po/sr.po275
-rw-r--r--po/sv.po268
-rw-r--r--po/tg.po268
-rw-r--r--po/th.po265
-rw-r--r--po/tr.po184
-rw-r--r--po/uk.po234
-rw-r--r--po/urpmi.pot150
-rw-r--r--po/uz.po234
-rw-r--r--po/vi.po194
-rw-r--r--po/wa.po285
-rw-r--r--po/zh_CN.po258
-rw-r--r--po/zh_TW.po266
54 files changed, 10379 insertions, 3200 deletions
diff --git a/po/Makefile b/po/Makefile
index b80eb575..c8640c1e 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -4,7 +4,7 @@ localedir = $(PREFIX)/usr/share/locale
PGOAL = urpmi
# perl files to search translatable strings in
-PL_FILES = ../_irpm ../urpm.pm ../urpme ../urpmi ../urpmi.addmedia \
+PL_FILES = ../_irpm ../urpm.pm ../urpme ../urpmf ../urpmi ../urpmi.addmedia \
../urpmi.removemedia ../urpmi.update ../urpmq \
../urpm/parallel_ka_run.pm ../urpm/parallel_ssh.pm
# C-like files to search translatable strings in
diff --git a/po/af.po b/po/af.po
index fc400192..d931f485 100644
--- a/po/af.po
+++ b/po/af.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KTranslator v 0.6.0\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "%s word installeer\n"
@@ -26,34 +26,34 @@ msgid ""
"You requested installation of package %s\n"
msgstr ""
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Is dit aanvaarbaar?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "OK"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Kanselleer"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "JjYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (J/n) "
@@ -603,7 +603,7 @@ msgid "Installation failed on node %s"
msgstr "Installasie het misluk"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "Installasie het misluk"
@@ -630,8 +630,9 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr ""
@@ -694,6 +695,133 @@ msgstr ""
msgid "Removing failed"
msgstr ""
+#: ../urpmf_.c:26
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+
+#: ../urpmf_.c:38
+msgid " --all - print all tags.\n"
+msgstr ""
+
+#: ../urpmf_.c:39
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+
+#: ../urpmf_.c:41
+msgid " --group - print tag group: group.\n"
+msgstr ""
+
+#: ../urpmf_.c:42
+msgid " --size - print tag size: size.\n"
+msgstr ""
+
+#: ../urpmf_.c:43
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr ""
+
+#: ../urpmf_.c:44
+msgid " --summary - print tag summary: summary.\n"
+msgstr ""
+
+#: ../urpmf_.c:45
+msgid " --description - print tag description: description.\n"
+msgstr ""
+
+#: ../urpmf_.c:46
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:47
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:48
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:49
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:50
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:51
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr ""
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+
+#: ../urpmf_.c:57
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:58
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -886,14 +1014,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1013,40 +1133,40 @@ msgstr ""
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
#, fuzzy
msgid "Only superuser is allowed to install packages"
msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, fuzzy, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Slegs een van die volgende pakkette word benodig:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Slegs een van die volgende pakkette word benodig:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Wat is u keuse (1-%d)"
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Jammer, swak keuse, probeer weer\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1054,31 +1174,31 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1086,7 +1206,7 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1095,42 +1215,42 @@ msgstr ""
"How afhanklikhede te bevredig, moet die volgende pakkette installeer word (%"
"d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Sit asb. die %s getiteld %s in"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "Druk ENTER wanneer u reg is..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "Die volgende pakket bevat %s: %s\n"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
#, fuzzy
msgid " (y/N) "
msgstr " (J/n) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1138,25 +1258,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Installasie het misluk"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "%s word installeer\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "Alles is alreeds installeer"
@@ -1171,10 +1291,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr ""
@@ -1228,10 +1344,6 @@ msgstr ""
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 08951e35..16bff427 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-20 13:28+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2001-12-20 23:13GMT+3\n"
"Last-Translator: Mohammed Gamal <f2c2001@yahoo.com>\n"
"Language-Team: Arabic\n"
@@ -638,8 +638,9 @@ msgstr ""
"\n"
"الاستخدام:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - تطبع رسالة المساعدة هذه.\n"
@@ -699,6 +700,164 @@ msgstr "لإرضاء الاعتمادات, ستتم ازالة الحزم الت
msgid "Removing failed"
msgstr "فشلت عملية الإزالة"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq الإصدار %s\n"
+"جميع الحقوق محفوظة 2000, 2001, 2002 MandrakeSoft.\n"
+"هذا برنامج حر و مجاني و يمكن اعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
+"\n"
+"الاستخدام:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - قم بتحديث الوسائط فقط.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - استخدم الوسائط المختارة بالفاصلة.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr " --synthesis - use the synthesis given instead of urpmi db.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - وضع تفصيلي.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - do not print tag name (default if no tag given on command"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - print all tags."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - print tag name: rpm filename (assumed if no tag given on"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - print tag group: group."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - print tag size: size."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - print tag size: size."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - print tag summary: summary."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description -print tag description: description."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides - print tag provides: all provides (multiple lines)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - print tag requires: all requires (multiple lines)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - print tag files: all files (multiple lines)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - قم بالإجبار على توليد ملفات hdlist.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - اعرض معلومات الإصدار و البرنامج مع الإسم.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - clean headers cache directory.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr " -u - ازالة الحزمة اذا كانت نسخة أفضل مثبتة مسبقا.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -u - ازالة الحزمة اذا كانت نسخة أفضل مثبتة مسبقا.\n"
+
+#
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - اختر كل الحزم المتفقة مع المعامل.\n"
+
+#
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - اختر كل الحزم المتفقة مع المعامل.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -940,14 +1099,6 @@ msgstr ""
"\n"
"الاستخدام:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - قم بتحديث الوسائط فقط.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - استخدم الوسائط المختارة بالفاصلة.\n"
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1248,10 +1399,6 @@ msgstr ""
"\n"
"الاستخدام:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr " --synthesis - use the synthesis given instead of urpmi db.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - list available packages.\n"
@@ -1307,10 +1454,6 @@ msgstr " -g - تطبع المجموعات أيضا مع الأسم�
msgid " -r - print version and release with name also.\n"
msgstr " -r - تطبع الإصدار و رقمه أيضا مع الإسم أيضاً.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - اعرض معلومات الإصدار و البرنامج مع الإسم.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " الأسماء أو ملفات rpm المعطاة على سطر الأوامر يتم الاستعلام عنها.\n"
@@ -1514,11 +1657,6 @@ msgstr "لم يتم ايجاد قائمة وسائط كاملة"
#~ msgid "problem reading hdlist file, trying again"
#~ msgstr "مشكلة في قراءة ملف hdlist, جاري اعادة المحاولة"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr " -u - ازالة الحزمة اذا كانت نسخة أفضل مثبتة مسبقا.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr "الوسيط \"%s\" يحاول استخدام قائمة مستخدمة مسبقا, تم تجاهل الوسيط"
diff --git a/po/az.po b/po/az.po
index 1dbb4880..47a0b740 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2001-11-14 17:06GMT+0200\n"
"Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
"Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.5\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "%s qurulur\n"
@@ -28,34 +28,34 @@ msgstr ""
"Paketlərin öz özünə qurulması...\n"
"%s paketlərininin qurulmasını istədiniz\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Oldu mu?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Oldu"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Ləğv et"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "XxJjNn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "BbYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (B/x) "
@@ -620,7 +620,7 @@ msgid "Installation failed on node %s"
msgstr "Qurulum iflas etdi"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "Qurulum iflas etdi"
@@ -647,8 +647,9 @@ msgid ""
"usage:\n"
msgstr "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - bu kömək ismarışını çap edər.\n"
@@ -714,6 +715,163 @@ msgstr ""
msgid "Removing failed"
msgstr "[%s] cəhd edilir"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - təkcə güncəl medyanı işlət.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - təfsilatlı mod.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - təq adlarını göstərmə (təq əmrə verilməyibsə əsasdır"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - bütün təqləri göstər."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - təq adını göstər: rpm fayladı (heç təq verilməyibsə"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - təq qrupunu göstər: qrup."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - təq böyüklüyünü göstər: böyüklük."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - təq böyüklüyünü göstər: böyüklük."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - təq icmalını göstər: icmal."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - təq izahatını göstər: izahat."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - təq gətirənini göstər: bütün gətirənlər (çoxlu sətir)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - lazımlılar təqini göstər: bütün lazımlılar (çoxlu sətir)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --files - təq fayllarını göstər: bütün fayllar (çoxlu sətir)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - təq toqquşmalarını göstər: bütün toqquşmalar (çoxlu "
+"sətir)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - təq mütləqlərini göstər: bütün mütləqlər (çoxlu sətir)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " --group - təq qrupunu göstər: qrup."
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - başlıq ara yaddaşı cərgəsini təmizlə.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - daha yaxşı buraxılışı onsuz da qurulu isə paketi çıxart.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - daha yaxşı buraxılışı onsuz da qurulu isə paketi çıxart.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - əmr sətirindəki bütün uyğun gələnləri seç.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - əmr sətirindəki bütün uyğun gələnləri seç.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -943,14 +1101,6 @@ msgid ""
"usage:\n"
msgstr "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - təkcə güncəl medyanı işlət.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1079,41 +1229,41 @@ msgstr ""
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "[%s] \"%s\" qiymətində düzgün darana bilmədi"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
#, fuzzy
msgid "Only superuser is allowed to install packages"
msgstr ""
"Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru məs'uliyyətlidir"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Aşağıdakı paketlərin bir dənəsinə %s ehtiyac hiss edir:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Seçkiniz? (1-%d)"
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Xətalı seçənək, təkrar sınayın\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1121,32 +1271,32 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr ""
"Yerli paketləri qurmaq üçün sadəcə olaraq sistem operatoru məs'uliyyətlidir"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1156,7 +1306,7 @@ msgstr ""
"bə'zi paketlər güncəllənmək üçün çıxardılmalıdırlar, bu da hələlik "
"dəstəklənmir\n"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1164,41 +1314,41 @@ msgid ""
msgstr ""
"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər də qurulmalıdır (%d Mb)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "qaynaq paketi alına bilmir, çıxılır"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "Qurtardığında enter düyməsinə basın..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (b/X) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1206,25 +1356,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Qurulum iflas etdi"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "%s qurulur\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Paket asılılıqlarına fikir vermədən qurmağı sınayım? (b/X) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "hər şey artıq qurulmuşdur"
@@ -1239,10 +1389,6 @@ msgid ""
"usage:\n"
msgstr "Bu, pulsuz proqramdır və GNU GPL lisenziyası altında dağıdıla bilər."
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
#, fuzzy
msgid " --list - list available packages.\n"
@@ -1309,10 +1455,6 @@ msgstr " --group - təq qrupunu göstər: qrup."
msgid " -r - print version and release with name also.\n"
msgstr " -r - adla birlikdə buraxılış və yayını da çap et.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
@@ -1789,13 +1931,6 @@ msgstr ""
#~ msgid "keeping only files referenced in provides"
#~ msgstr "təkcə gətirənlərdə yad edilən fayllar saxlanılır"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - daha yaxşı buraxılışı onsuz da qurulu isə paketi "
-#~ "çıxart.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr ""
#~ "\"%s\" medyumu onsuz da istifadədə olan bir siyahını işlətməyə cəhd etdi, "
diff --git a/po/bg.po b/po/bg.po
index 8022881a..23ab3af8 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2000-01-30 17:59+0100\n"
"Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
"Language-Team: Bulgarian\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=windows-1251\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "����������� %s\n"
@@ -27,34 +27,34 @@ msgstr ""
"����������� ���������� �� ������ ...\n"
"��� ��������� ���������� �� ����� %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "���� ����� �� �"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "�����"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "�����"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "��Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "��Yy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (�/�) "
@@ -689,7 +689,7 @@ msgid "Installation failed on node %s"
msgstr "������������ ���������"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "������������ ���������"
@@ -716,8 +716,9 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr ""
@@ -782,6 +783,170 @@ msgstr ""
msgid "Removing failed"
msgstr "...���������� �� �������"
+#: ../urpmf_.c:26
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - �� ��������� ����� �� ���� (�� ������������ ��� �� � "
+"������� ��� �� ���������"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - ��������� ������ ������."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - ��������� ����� �� ����: ����� �� rpm ����� (�� "
+"������������ ��� �� � ������� ���"
+
+# msgstr " --group - ��������� ������� ������: group."
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - ��������� ������� �� ������: group."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - ��������� ������� �� ����: size."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - ��������� ������� �� ����: size."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - ��������� ������ �� ����: summary."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - ��������� �������� �� ����: description."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --requires - ��������� ���������� �� ����: ������ ���������� "
+"(��������� ������)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - ��������� ���������� �� ����: ������ ���������� "
+"(��������� ������)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --requires - ��������� ���������� �� ����: ������ ���������� "
+"(��������� ������)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - ��������� ����������� �� ����: ������ ��������� "
+"(��������� ������)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --conflicts - ��������� ����������� �� ����: ������ ��������� "
+"(��������� ������)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - �������� �� ������������ �� hdlist �������.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+#, fuzzy
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - ��������� ������,���������� � ����������� � ���.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - ���������� �� ����� ��� ������������.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - �������� ������ ��� ���� � ����������� �� ����� ������.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - �������� ������ ��� ���� � ����������� �� ����� ������.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - �������� �� ������ ���������� �� ��������� ���.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - �������� �� ������ ���������� �� ��������� ���.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -1003,14 +1168,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1133,40 +1290,40 @@ msgstr ""
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
#, fuzzy
msgid "Only superuser is allowed to install packages"
msgstr "���� superuser-� ��� ������� �� ��������� ������� ������"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, fuzzy, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "���� �� ���� ������ � ��������� �� ���������� �� %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "���� �� ���� ������ � ���������:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "����� � ������ �����? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "���������,��� �����, �������� ������\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1174,31 +1331,31 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "���� superuser-� ��� ������� �� ��������� ������� ������"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1208,7 +1365,7 @@ msgstr ""
"����� ������ ������ �� ����� ���������� �� �� �� ����������, ���� �� �� "
"�������� ��� ���\n"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1216,42 +1373,42 @@ msgid ""
msgstr ""
"�� �� �� ������� �������������,���� ������ �� ����� ����������� (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "���� ������� \"%s\" � ���������� [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "��������� Enter,������ ��� ������..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "���� ������ �������� %s: %s"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
#, fuzzy
msgid " (y/N) "
msgstr " (�/�) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1259,25 +1416,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "������������ ���������"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "����������� %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "���� �� ����������� ��� �������� �� �����������? (�/�) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "���� �� ����������� ���� ��-����� (--force)? (�/�) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "������ � ����������� ����"
@@ -1292,10 +1449,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
#, fuzzy
msgid " --list - list available packages.\n"
@@ -1360,11 +1513,6 @@ msgstr " -g - ��������� ���� ������� � �����.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - ��������� ������ � ���� ���� ���������� � ���.\n"
-#: ../urpmq_.c:72
-#, fuzzy
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - ��������� ������,���������� � ����������� � ���.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
@@ -1705,13 +1853,6 @@ msgstr ""
#~ msgid "problem reading hdlist file, trying again"
#~ msgstr "������� ��� ������ �� hdlist �����, ��������� �� �����"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - �������� ������ ��� ���� � ����������� �� ����� "
-#~ "������.\n"
-
# Another meaning of the word is in the sens� "The iron is good medium for the eletricity"
# in this case must be "���������"
# "list" is translated in the meaning of "list file"
diff --git a/po/bs.po b/po/bs.po
index aaa28718..beb97dd8 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2001-09-19 13:34GMT\n"
"Last-Translator: Amila Akagi� <bono@lugbih.org>\n"
"Language-Team: Bosnian <lokal-subscribe@lugbih.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.1\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "instaliram %s\n"
@@ -27,34 +27,34 @@ msgstr ""
"Automatska instalacija paketa..\n"
"Zahtjevali ste instalaciju paketa %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Je li u redu?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "U redu"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Odustani"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "DdYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (D/n) "
@@ -608,7 +608,7 @@ msgid "Installation failed on node %s"
msgstr "Instalacija nije uspjela"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "Instalacija nije uspjela"
@@ -636,8 +636,9 @@ msgid ""
msgstr ""
"Ovo je slobodan software i mo�e biti distribuiran pod uslovima GNU GPL-e."
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr ""
@@ -697,6 +698,134 @@ msgstr ""
msgid "Removing failed"
msgstr ""
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"Ovo je slobodan software i mo�e biti distribuiran pod uslovima GNU GPL-e."
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+
+#: ../urpmf_.c:38
+msgid " --all - print all tags.\n"
+msgstr ""
+
+#: ../urpmf_.c:39
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+
+#: ../urpmf_.c:41
+msgid " --group - print tag group: group.\n"
+msgstr ""
+
+#: ../urpmf_.c:42
+msgid " --size - print tag size: size.\n"
+msgstr ""
+
+#: ../urpmf_.c:43
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr ""
+
+#: ../urpmf_.c:44
+msgid " --summary - print tag summary: summary.\n"
+msgstr ""
+
+#: ../urpmf_.c:45
+msgid " --description - print tag description: description.\n"
+msgstr ""
+
+#: ../urpmf_.c:46
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:47
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:48
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:49
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:50
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:51
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr ""
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+
+#: ../urpmf_.c:57
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:58
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -921,14 +1050,6 @@ msgid ""
msgstr ""
"Ovo je slobodan software i mo�e biti distribuiran pod uslovima GNU GPL-e."
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1048,40 +1169,40 @@ msgstr "urpmi: nepoznata opcija \"-%s\", provjeri upotrebu sa --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
#, fuzzy
msgid "Only superuser is allowed to install packages"
msgstr "Jedino super korisnik (root) mo�e instalirati lokalne pakete"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, fuzzy, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Jedan od sljede�ih paketa je potreban:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Jedan od sljede�ih paketa je potreban:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Va� izbor je? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "�ao mi je, lo� izbor, probaj kasnije\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1089,31 +1210,31 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "Jedino super korisnik (root) mo�e instalirati lokalne pakete"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1123,7 +1244,7 @@ msgstr ""
"neki paketi trebaju biti uklonjeni da bi mogli biti nadogra�eni, ovo jo� "
"nije podr�ano\n"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1131,42 +1252,42 @@ msgid ""
msgstr ""
"Da bi zadovoljili dependencies, sljede�i paketi �e biti instalirani (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "ne mogu dobiti izvorni paket, prekidam"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Molim ubacite medij sa imenom \"%s\" u ure�aj [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "Pritisnite enter kada zavr�i..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "Jedan od sljede�ih paketa je potreban:"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
#, fuzzy
msgid " (y/N) "
msgstr " (D/n) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1174,25 +1295,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Instalacija nije uspjela"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "instaliram %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Poku�aj instalaciju bez provjere dependencies? (d/N)"
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Poku�aj instalaciju jo� ja�e (--force opcija)? (d/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "sve je ve� instalirano"
@@ -1208,10 +1329,6 @@ msgid ""
msgstr ""
"Ovo je slobodan software i mo�e biti distribuiran pod uslovima GNU GPL-e."
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr ""
@@ -1265,10 +1382,6 @@ msgstr ""
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 6e097862..7f69ae35 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-09-05 20:23+0200\n"
"Last-Translator: Softcatal� <traddrake@softcatala.org>\n"
"Language-Team: Catalan <info@softcatala.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "s'est� instal�lant %s\n"
@@ -27,34 +27,34 @@ msgstr ""
"Instal�laci� autom�tica dels paquets...\n"
"Heu demanat la instal�laci� del paquet %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "�s correcte?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "D'acord"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Cancel�la"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "SsYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (S/n) "
@@ -615,7 +615,7 @@ msgid "Installation failed on node %s"
msgstr "La instal�laci� ha fallat en el node %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "La instal�laci� �s possible"
@@ -647,8 +647,9 @@ msgstr ""
"\n"
"sintaxi:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - mostra aquest missatge d'ajuda.\n"
@@ -715,6 +716,181 @@ msgstr ""
msgid "Removing failed"
msgstr "...la c�pia ha fallat"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq versi� %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Aquest programa �s lliure i es pot redistribuir sota els termes de la GPL de "
+"GNU.\n"
+"\n"
+"sintaxi:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - utilitza nom�s els suports d'actualitzaci�.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - utilitza nom�s els suports llistats amb comes.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+" --synthesis - utilitza la s�ntesi donada en comptes de la bd de urpmi.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - mode detallat.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - no mostris el nom de l'etiqueta (per defecte si no "
+"s'indica cap etiqueta a la l�nia"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - mostra totes les etiquetes."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - mostra l'etiqueta 'name': nom del fitxer rpm (suposant "
+"que no s'ha indicat cap etiqueta a"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - mostra l'etiqueta 'group': grup."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - mostra l'etiqueta 'size': mida."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - mostra l'etiqueta 'size': mida."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - mostra l'etiqueta 'summary': resum."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - mostra l'etiqueta 'description': descripci�."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - mostra l'etiqueta 'provides': tots els "
+"'provides' (l�nies m�ltiples)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - mostra l'etiqueta 'requires': tots els "
+"'requires' (l�nies m�ltiples)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --files - mostra l'etiqueta 'files': tots els fitxers (l�nies "
+"m�ltiples)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - mostra l'etiqueta 'conflicts': tots els conflictes "
+"(l�nies m�ltiples)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - mostra l'etiqueta 'obsoletes': tots els obsolets (l�nies "
+"m�ltiples)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - imposa la generaci� de fitxers hdlist.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+" -f - mostra la versi�, llan�ament i arquitectura amb el nom.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - buida el directori de mem�ria cau de cap�aleres.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - elimina el paquet si ja hi ha instal�lada una versi� "
+"millor.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - elimina el paquet si ja hi ha instal�lada una versi� "
+"millor.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+" -a - selecciona totes les coincid�ncies en la l�nia d'ordres.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+" -a - selecciona totes les coincid�ncies en la l�nia d'ordres.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -961,14 +1137,6 @@ msgstr ""
"\n"
"sintaxi:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - utilitza nom�s els suports d'actualitzaci�.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - utilitza nom�s els suports llistats amb comes.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1119,39 +1287,39 @@ msgstr "urpmi: opci� desconeguda \"-%s\", comproveu-ne la sintaxi amb --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "No s'ha pogut crear el directori [%s] per a l'informe d'errors"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "El superusuari �s l'�nic autoritzat per a instal�lar paquets"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Un dels paquets seg�ents necessita ser instal�lat %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Cal un dels paquets seg�ents:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Quina �s la vostra elecci�? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Elecci� incorrecta, torneu-ho a provar\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1162,31 +1330,31 @@ msgstr ""
"%s\n"
"Hi esteu d'acord ?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "no s'ha pogut instal�lar el paquet %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "no es troba wget\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s conflicteix amb %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1197,7 +1365,7 @@ msgstr ""
"%s\n"
"Hi esteu d'acord ?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1205,7 +1373,7 @@ msgid ""
msgstr ""
"Per complir les depend�ncies, s'instal�laran els paquets seg�ents (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1214,32 +1382,32 @@ msgstr ""
"Es necessita ser 'root' per a instal�lar les seg�ents depend�ncies:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "no es poden recuperar els paquets font. S'est� interrompent"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Si us plau, inseriu el suport anomenat \"%s\" al dispositiu [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Premeu Intro quan estigui fet..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Els paquets seg�ents tenen signatures incorrectes"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Voleu continuar la instal�laci� ?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1249,26 +1417,26 @@ msgstr ""
"La instal�laci� ha fallat, no s'han trobat alguns fitxers.\n"
"Potser voleu actualitzar la base de dades urpmi"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "La instal�laci� ha fallat"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "s'est� distribuint %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr ""
"Voleu intentar la instal�laci� sense comprovar les depend�ncies? (s/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Voleu intentar la insta�laci� encara amb m�s for�a (--force)? (s/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "ja est� tot instal�lat"
@@ -1289,11 +1457,6 @@ msgstr ""
"\n"
"sintaxi:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-" --synthesis - utilitza la s�ntesi donada en comptes de la bd de urpmi.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - llista els paquets disponibles.\n"
@@ -1359,11 +1522,6 @@ msgid " -r - print version and release with name also.\n"
msgstr ""
" -r - mostra la versi� i llan�ament juntament amb el nom.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-" -f - mostra la versi�, llan�ament i arquitectura amb el nom.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
@@ -1551,13 +1709,6 @@ msgstr "no s'ha trobat cap llista de suports completa"
#~ "s'han d'eliminar alguns paquets per poder actualitzar-los, aix� encara no "
#~ "es pot fer\n"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - elimina el paquet si ja hi ha instal�lada una versi� "
-#~ "millor.\n"
-
#~ msgid "Press Enter when it's done..."
#~ msgstr "Premeu Intro quan estigui fet..."
diff --git a/po/cs.po b/po/cs.po
index f5b78e75..d7dc123c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-09-02 12:28GMT\n"
"Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.5\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "instaluji %s\n"
@@ -30,34 +30,34 @@ msgstr ""
"Automatick� instalace bal��k�....\n"
"Zadal jste instalaci bal��ku %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Je to spr�vn�?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "OK"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Zru�it"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "AaYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (A/n) "
@@ -616,7 +616,7 @@ msgid "Installation failed on node %s"
msgstr "Instalace selhala na uzlu %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "Instalace je mo�n�"
@@ -648,8 +648,9 @@ msgstr ""
"\n"
"pou�it�:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - vyp��e tuto n�pov�du.\n"
@@ -715,6 +716,166 @@ msgstr ""
msgid "Removing failed"
msgstr "...kop�rov�n� selhalo"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq verze %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Toto je svobodn� software a je voln� �i�iteln� podle podm�nek licence GNU "
+"GPL.\n"
+"\n"
+"pou�it�:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - pou��t pouze aktualizaci zdroje.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - pou��t pouze zdroje odd�len� ��rkou.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+" --synthesis - pou��t dan� soubor se synt�zou m�sto datab�ze urpmi.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - re�im s v�pisy.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - nevyp��e jm�no tagu (v�choz� chov�n�, pokud nen� jm�no "
+"tagu"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - vyp��e v�echny tagy."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - vyp��e tag: jm�no rpm souboru (p�edpokl�dan�, pokud nen�"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - vyp��e tag skupina: group."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - vyp��e tag velikost: size."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - vyp��e tag velikost: size."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - vyp��e tag souhrn: summary."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - vyp��e tag popis: description."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - vyp��e tag poskytuje: all provides (na v�ce ��dek)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - vyp��e tag vy�aduje: all requires (na v�ce ��dek)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - vyp��e tag soubory: all files (na v�ce ��dek)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - vyp��e tag konflikty: all conflicts (na v�ce ��dek)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - vyp��e tag nahrazuje: all obsoletes (na v�ce ��dek)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - provede generov�n� hdlist soubor�.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+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"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - sma�e do�asn� adres��.\n"
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -f - provede generov�n� hdlist soubor�.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - vybere v�echny vyhovuj�c� z p��kazov� ��dky.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - vybere v�echny vyhovuj�c� z p��kazov� ��dky.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -952,14 +1113,6 @@ msgstr ""
"\n"
"pou�it�:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - pou��t pouze aktualizaci zdroje.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - pou��t pouze zdroje odd�len� ��rkou.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1098,40 +1251,40 @@ msgstr "urpmi: nezn�m� volba \"%s\", zp�sob pou�it� vyvol�te zad�n�m --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Nelze vytvo�it adres�� [%s] pro ulo�en� hl�en� o chyb�"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Instalovat bal��ky m��e pouze u�ivatel root"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr ""
"Pro instalaci %s je zapot�eb� nainstalovat jeden z n�sleduj�c�ch bal��k�:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Je zapot�eb� jeden z n�sleduj�c�ch bal��k�:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Jak� je va�e volba? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Je mi l�to, to je �patn� volba. Zkuste to znovu\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1142,31 +1295,31 @@ msgstr ""
"%s\n"
"Souhlas�te?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "nelze nainstalovat bal��ek %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "chyb� program wget\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s je v konfliktu s %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1177,7 +1330,7 @@ msgstr ""
"%s\n"
"Souhlas�te?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1185,7 +1338,7 @@ msgid ""
msgstr ""
"Aby byly spln�ny z�vislosti, budou nainstalov�ny n�sleduj�c� bal��ky (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1194,32 +1347,32 @@ msgstr ""
"Pro instalaci n�sleduj�c�ch z�vislost� pot�ebujete m�t pr�vo root:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "nelze z�skat zdrojov� bal��ek, kon��m"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Pros�m vlo�te m�dium nazvan� \"%s\" do za��zen� [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Stiskn�te kl�vesu Enter a� budete p�ipraveni..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "N�sleduj�c� bal��ky maj� �patn� signatury"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Chcete pokra�ovat v instalaci?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (a/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1229,25 +1382,25 @@ msgstr ""
"Instalace selhala, n�kter� soubory chyb�.\n"
"Bude nutn� aktualizovat datab�zi urpmi"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Chyba p�i instalaci"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "distribuuji %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "M�m zkusit instalaci bez kontroly z�vislost�? (a/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "M�m zkusit instalaci je�t� razantn�ji (--force)? (a/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "v�e je ji� nainstalov�no"
@@ -1268,11 +1421,6 @@ msgstr ""
"\n"
"pou�it�:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-" --synthesis - pou��t dan� soubor se synt�zou m�sto datab�ze urpmi.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - vyp��e bal��ky, kter� jsou k dispozici.\n"
@@ -1336,11 +1484,6 @@ msgstr " -g - vyp��e tag skupin spole�n� se jm�nem.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - spole�n� se jm�nem vyp��e verzi a vyd�n�.\n"
-#: ../urpmq_.c:72
-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"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/cy.po b/po/cy.po
index 95d10c72..1ed9751f 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-03-07 21:04-0000\n"
"Last-Translator: Rhoslyn Prys <rhoslyn.prys@ntlworld.com>\n"
"Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-14\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "gosod %s\n"
@@ -27,34 +27,34 @@ msgstr ""
"Gosodiad pecynnau awtomatig...\n"
"Roeddech wedi gofyn i gael gosod pecyn %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Mae'r model yn gywir"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Iawn"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Dileu"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "Yy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (Y/n) "
@@ -616,7 +616,7 @@ msgid "Installation failed on node %s"
msgstr "methodd y gosodiad"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "methodd y gosodiad"
@@ -646,8 +646,9 @@ msgstr ""
"\n"
" rhydd\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
#, fuzzy
msgid " --help - print this help message.\n"
msgstr "Dangos y cymorth hwn a gadael"
@@ -714,6 +715,165 @@ msgstr ""
msgid "Removing failed"
msgstr "methodd y gosodiad"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"\n"
+"\n"
+" rhydd\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr "Modd Kudz"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - peidiwch argraffu enw tag (rhagosodedig os nad oes tag "
+"yn cael ei roi ar "
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr "Argraffu tudalennau prawf"
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - argraffu enw'r tag: enw ffeil rpm (dyfaliad os nad oed "
+"tag yn cael ei gynnig"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr "Argraffu tudalennau prawf"
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr "Argraffu tudalennau prawf"
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr "Argraffu tudalennau prawf"
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr "Argraffu tudalennau prawf"
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr "Argraffu tudalennau prawf"
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - tag argraffu'n darparu: pob darpariaeth (llinellau "
+"lluosog)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - tag argraffu'n darparu: all requires (multiple lines)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - print tag files: all files (multiple lines)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr "grym"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+#, fuzzy
+msgid " -f - print version, release and arch with name.\n"
+msgstr "enw"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr "Dewiswch y cyfrwng ar gyfer cadw wrth gefn..."
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr "grym"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr "Dewiswch y cyfrwng ar gyfer cadw wrth gefn..."
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr "Dewiswch y cyfrwng ar gyfer cadw wrth gefn..."
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -932,14 +1092,6 @@ msgstr ""
"\n"
" rhydd\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1072,41 +1224,41 @@ msgstr "anhysbus"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr ""
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, fuzzy, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Un:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
#, fuzzy
msgid "One of the following packages is needed:"
msgstr "Un:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, fuzzy, c-format
msgid "What is your choice? (1-%d) "
msgstr "Pa fath o gysylltiad IDSN?"
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
#, fuzzy
msgid "Sorry, bad choice, try again\n"
msgstr "Ymddiheuriad"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1114,31 +1266,31 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "Mae pecyn gorfodol %s ar goll"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1146,48 +1298,48 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr "Un:"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "dyfais"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "gorffen."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "Diweddaru'r pecynnau'n unig"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr ""
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1195,27 +1347,27 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
#, fuzzy
msgid "Installation failed"
msgstr "methodd y gosodiad"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "gosod %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr ""
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
#, fuzzy
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "grym "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
#, fuzzy
msgid "everything already installed"
msgstr "Pecynnau wedi eu gosod eisoes"
@@ -1234,10 +1386,6 @@ msgstr ""
"\n"
" rhydd\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
#, fuzzy
msgid " --list - list available packages.\n"
@@ -1300,11 +1448,6 @@ msgstr "enw"
msgid " -r - print version and release with name also.\n"
msgstr "enw"
-#: ../urpmq_.c:72
-#, fuzzy
-msgid " -f - print version, release and arch with name.\n"
-msgstr "enw"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/da.po b/po/da.po
index e1d9e234..f47b4bc7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-11-17 00:45+0100\n"
"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
"Language-Team: dansk <dansk@klid.dk>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "installerer %s\n"
@@ -31,34 +31,34 @@ msgstr ""
"Automatisk installation af pakker...\n"
"Du bestilte installation af pakke %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Er det o.k.?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "O.k."
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Annull�r"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "YyJj"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (J/n) "
@@ -613,7 +613,7 @@ msgid "Installation failed on node %s"
msgstr "Installationen fejlede p� knude %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "Installation er mulig"
@@ -644,8 +644,9 @@ msgstr ""
"\n"
"brug:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - udskriv denne hj�lpebesked.\n"
@@ -710,6 +711,168 @@ msgstr ""
msgid "Removing failed"
msgstr "...kopiering mislykkedes"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq version %s\n"
+"Ophavsret (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Dette er frit programmel og kan redistribueres under vilk�rene til GNU GPL.\n"
+"\n"
+"brug:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - brug kun opdateringsmedia.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - brug kun media listet med komma.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr " --synthesis - brug synthesis angivet i stedet for urpmi-db.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - udf�rlig tilstand.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - skriv ikke m�rkenavn (standard hvis intet m�rke angivet "
+"p� kommando"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - skriv alle m�rker."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - skriv m�rkenavn: rpm filnavn (antaget hvis intet m�rke "
+"givet p�"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - skriv m�rkegruppe: gruppe."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - skriv m�rke-st�rrelse: st�rrelse."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - skriv m�rke-st�rrelse: st�rrelse."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - skriv m�rke-resum�: resum�."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - skriv m�rke-beskrivelse: beskrivelse."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides - skriv m�rke-tilbud: alle tilbud (flere linjer)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - skriv m�rke-krav: alle krav (flere linjer)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - skriv m�rke-filer: alle filer (flere linjer)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - skriv m�rke-konflikter: alle konflikter (flere linjer)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - skriv m�rke-for�ldede: alle for�ldede (flere linjer)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - gennemf�r generering af hdlist-filer.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - udskriv version, udgave og arkitektur med navn.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - rydder katalog med cache for headere.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - fjern pakke hvis en bedre version allerede er "
+"installeret.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - fjern pakke hvis en bedre version allerede er "
+"installeret.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - v�lg alle pakker matchende udtryk.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - v�lg alle pakker matchende udtryk.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -943,14 +1106,6 @@ msgstr ""
"\n"
"brug:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - brug kun opdateringsmedia.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - brug kun media listet med komma.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1087,39 +1242,39 @@ msgstr "urpmi: ukendt parameter \"-%s\", tjek brug med --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "kunne ikke oprette katalog [%s] til fejlrapport"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Kun superbrugeren har lov til at installere pakker"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Der er brug for en af de f�lgende pakker for at installere %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Der er brug for en af de f�lgende pakker:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Hvad er dit valg? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Undskyld, d�rligt valg, pr�v igen\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1129,31 +1284,31 @@ msgstr ""
"Nogen forespurgte pakker kan ikke installeres:\n"
"%ser dette i orden?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "kunne ikke installere pakke %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "'wget' mangler\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s er i modstrid med %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1164,7 +1319,7 @@ msgstr ""
"%s\n"
"er dette i orden?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1173,7 +1328,7 @@ msgstr ""
"For at tilfredsstille afh�ngigheder vil de f�lgende pakker blive installeret "
"(%d Mb)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1182,32 +1337,32 @@ msgstr ""
"Du skal v�re root for at installere de f�lgende afh�ngigheder:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "kan ikke hente kilde-pakker, afslutter med fejl"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "V�r venlig at inds�tte mediet med navnet %s i enhed [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Tryk p� retur, n�r den er f�rdig..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "De f�lgende pakker har d�rlige signaturer"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "�nsker du at forts�tte installationen?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1217,25 +1372,25 @@ msgstr ""
"Installationen mislykkedes, nogle filer mangler.\n"
"Du �nsker m�ske at opdatere din urpmi-database"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Installationen fejlede"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "distribuerer %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Pr�v installation uden at tjekke afh�ngigheder? (j/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Pr�v installation med endnu st�rre kraft (--force)? (j/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "alting er allerede installeret"
@@ -1255,10 +1410,6 @@ msgstr ""
"\n"
"brug:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr " --synthesis - brug synthesis angivet i stedet for urpmi-db.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - skriv tilg�ngelige pakker.\n"
@@ -1317,10 +1468,6 @@ msgstr " -g - udskriv ogs� grupper med navn.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - udskriv ogs� version og udgave med navn.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - udskriv version, udgave og arkitektur med navn.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " navne eller rpm-filer givne p� kommandolinjen bliver forespurgt.\n"
@@ -1512,13 +1659,6 @@ msgstr "ingen fuld media-liste blev fundet"
#~ msgid "problem reading hdlist file, trying again"
#~ msgstr "problem ved l�sning af hdlist-fil, pr�ver igen"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - fjern pakke hvis en bedre version allerede er "
-#~ "installeret.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr ""
#~ "media \"%s\" pr�ver at bruge en allerede brugt liste, media ignoreret"
diff --git a/po/de.po b/po/de.po
index be782adf..9970e43c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-08-31 14:40+0200\n"
"Last-Translator: Stefan Siegel <siegel@linux-mandrake.com>\n"
"Language-Team: German <cooker-i18n@linux-mandrake.com>\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr ""
@@ -31,34 +31,34 @@ msgstr ""
"Automatische Installation von Paketen ...\n"
"Sie wünschen die Installation von Paket „%s“\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Ist das in Ordnung?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Ok"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Abbruch"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "JjYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (J/n) "
@@ -629,7 +629,7 @@ msgid "Installation failed on node %s"
msgstr "Die Installation auf Knoten „%s“ schlug Fehl"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "Die Installation ist möglich"
@@ -660,8 +660,9 @@ msgstr ""
"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
"Vertrieben werden.\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - Diese Hilfe-Botschaft anzeigen.\n"
@@ -732,6 +733,181 @@ msgstr ""
msgid "Removing failed"
msgstr "... das Kopieren schlug fehl!"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq Version %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
+"Vertrieben werden.\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - Verwende nur Aktualisierungs-Medien.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - Benutze nur durch Kommata getrennte Medienliste.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+" --synthesis - Verwende die angegebene Synthese-Datei anstelle\n"
+" der urpmi-DB.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - ausführlicher Modus.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - Keine Parameter ausgeben (Standard, wenn kein Parameter"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - Alle Parameter ausgeben."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - Ausgabe des Attributs „Name des RPMs“ (Dieses Attribut"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - Ausgabe des Attributs „Gruppe“."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - Ausgabe des Attributs „Größe“."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - Ausgabe des Attributs „Größe“."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - Ausgabe des Attributs „Zusammenfassung“."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - Ausgabe des Attributs „Beschreibung“."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - Ausgabe des Attributs „Stellt zur Verfügung“ (mehrere\n"
+" Zeilen möglich)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - Ausgabe des Attributs „Benötigt“ (mehrere Zeilen "
+"möglich)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --files - Ausgabe des Attribus „Dateien“ (mehrere Zeilen möglich)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - Ausgabe des Attributs „Steht in Konflikt mit“ (mehrere\n"
+" Zeilen möglich)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - Ausgabe des Attributs „Macht überflüssig“ (mehrere "
+"Zeilen\n"
+" möglich)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - Erzwinge das Erstellen einer HD-Liste.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+" -f - Ausgabe von Version, Release und Architektur mit dem "
+"Namen.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - Löschen des Header-Verzeichnisses.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - Entferne Paket wenn eine bessere Version schon "
+"installiert ist.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - Entferne Paket wenn eine bessere Version schon "
+"installiert ist.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+" -a - Wähle alle Treffer in der Kommandozeile.\n"
+"\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+" -a - Wähle alle Treffer in der Kommandozeile.\n"
+"\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -973,14 +1149,6 @@ msgstr ""
"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
"Vertrieben werden.\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - Verwende nur Aktualisierungs-Medien.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - Benutze nur durch Kommata getrennte Medienliste.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1128,39 +1296,39 @@ msgstr "urpmi: unbekannte Option „-%s“. Bitte Hilfe mit --help nachschlagen\
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Konnte das Verzeichnis [%s] für die Fehlerberichte nicht anlegen."
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Nur der Systemadministrator darf Pakete installieren."
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Eines der folgenden Pakete wird zur Installation von %s benötigt:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Eines der folgenden Pakete wird benötigt:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ihre Wahl? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Eine schlechte Wahl, versuchen Sie es erneut\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1171,31 +1339,31 @@ msgstr ""
"%s\n"
"Sind Sie einverstanden?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "Ich kann das Paket „%s“ nicht installeren."
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget fehlt\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s steht im Konflikt mit %s."
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1207,7 +1375,7 @@ msgstr ""
"%s\n"
"Sind Sie damit einverstanden?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1216,7 +1384,7 @@ msgstr ""
"Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert (%"
"d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1226,32 +1394,32 @@ msgstr ""
"können:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "Ich kann die Quellpakete nicht finden, Abbruch."
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Bitte legen Sie das Medium mit Namen „%s“ in Gerät „%s“."
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Betätigen Sie die Return-Taste, sobald Sie soweit sind ..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Folgenden Pakete haben inkorrekte Signaturen:"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Wollen Sie die Installation fortsetzen?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1261,25 +1429,25 @@ msgstr ""
"Installation fehlgeschlagen, einige Dateien fehlen.\n"
"Sie sollten Ihre urpmi-Datenbank aktualisieren"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Die Installation schlug Fehl"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "Verteile %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Soll ich eine Installation ohne Abhängigkeitstest versuchen? (j/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Soll ich eine Installation mit Gewalt (--force) versuchen? (j/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "Alles bereits installiert"
@@ -1298,12 +1466,6 @@ msgstr ""
"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
"Vertrieben werden.\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-" --synthesis - Verwende die angegebene Synthese-Datei anstelle\n"
-" der urpmi-DB.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - Alle verfügbaren Pakete auflisten.\n"
@@ -1372,12 +1534,6 @@ msgstr " -g - Ausgabe der Gruppe mit dem Namen.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - Ausgabe von Version und Release mit dem Namen.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-" -f - Ausgabe von Version, Release und Architektur mit dem "
-"Namen.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
@@ -1663,13 +1819,6 @@ msgstr "Es wurde keine komplette Medienliste gefunden"
#~ msgid "keeping only files referenced in provides"
#~ msgstr "Nur Behalten der Dateien, die als Anbieter referenziert werden."
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - Entferne Paket wenn eine bessere Version schon "
-#~ "installiert ist.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr ""
#~ "Das Medium „%s“ versucht eine bereits verwendete Liste ebenfalls zu "
diff --git a/po/el.po b/po/el.po
index ef93787f..d2296ea8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2001-08-22 22:42+0300\n"
"Last-Translator: Thanos Kyritsis <djart@hellug.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.8\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "����������� %s\n"
@@ -28,34 +28,34 @@ msgstr ""
"�������� ����������� �������...\n"
"�������� ��� ����������� ��� ������� %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "����� �������;"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "�������"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "�����"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "��Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "��Yy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (�/�) "
@@ -620,7 +620,7 @@ msgid "Installation failed on node %s"
msgstr "� ����������� �������"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "� ����������� �������"
@@ -649,8 +649,9 @@ msgstr ""
"���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
"GNU GPL."
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
#, fuzzy
msgid " --help - print this help message.\n"
msgstr " --all - ������ ��� �� tags."
@@ -716,6 +717,167 @@ msgstr ""
msgid "Removing failed"
msgstr "�������� [%s]"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
+"GNU GPL."
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - ��� �������� �� ����� tag (��' ������� �� ������ tag ��� "
+"����� ���� ������"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - ������ ��� �� tags."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - ������ �� ����� tag: ����� ������� rpm (��������������� "
+"�� ��� ����� tag ����"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - ������ �� tag group: group."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - ������ �� ������� ��� tag: �������."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - ������ �� ������� ��� tag: �������."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - ������ ��� �������� ��� tag: ��������."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - ������ ��� ��������� ��� tag: ���������."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - ������ ��� ������� ��� tag: ���� ��� ������� (��������� "
+"�������)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - ������ ��� ���������� ��� tag: ���� ��� ���������� "
+"(��������� �������)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --files - ������ �� ������ ��� tag: ��� �� ������ (��������� "
+"�������)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - ������ ��� ����������� ��� tag: ���� ��� ����������� "
+"(��������� �������)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - ������ �� tag obsoletes: ��� �� obsoletes (��������� "
+"�������)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " --group - ������ �� tag group: group."
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " --all - ������ ��� �� tags."
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " --group - ������ �� tag group: group."
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " --all - ������ ��� �� tags."
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " --all - ������ ��� �� tags."
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -950,14 +1112,6 @@ msgstr ""
"���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
"GNU GPL."
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1085,40 +1239,40 @@ msgstr "urpmq: ������� ���������� \"-%s\", ������� ��� ������� �� �� --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "�������� �������� ����� ��� [%s] ���� ���� \"%s\""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
#, fuzzy
msgid "Only superuser is allowed to install packages"
msgstr "���� � ����������� ������ �� ������������ ������ ������"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, fuzzy, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "��� �� ��� �������� ������� ����������:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "��� �� ��� �������� ������� ����������:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "���� ����� � ������� ���; (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "�������, ���� �������, ����������� ����\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1126,31 +1280,31 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "���� � ����������� ������ �� ������������ ������ ������"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1160,7 +1314,7 @@ msgstr ""
"������ ������ ������ �� ��������� ��� �� ������������, ���� ��� "
"������������� �����\n"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1169,42 +1323,42 @@ msgstr ""
"��� �� ������������� �� ���������� (dependencies), �� �������� ������ �� "
"������������� (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "�������� ������������ ��� ������� (source) �������, �����������"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "�������� ����� �� ���� �� ����� \"%s\" ��� ������� [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "������� enter ���� ����������..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "�� �������� ������ ��������� %s: %s"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
#, fuzzy
msgid " (y/N) "
msgstr " (�/�) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1212,27 +1366,27 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "� ����������� �������"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "����������� %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr ""
"���������� ��� ����������� ����� ��� ������ ��� ���������� (dependencies); "
"(�/�) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "���������� ��� ��� ������ ����������� (--force); (�/�) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "��� ����� ��� �������������"
@@ -1249,10 +1403,6 @@ msgstr ""
"���� ����� �������� ��������� ��� ������ �� ���������� ��� ���� ����� ��� "
"GNU GPL."
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
#, fuzzy
msgid " --list - list available packages.\n"
@@ -1316,10 +1466,6 @@ msgstr " --group - ������ �� tag group: group."
msgid " -r - print version and release with name also.\n"
msgstr " ������ ������� ���� ����� ����� �������)."
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/eo.po b/po/eo.po
index 4fa0b7d4..af7eca6f 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2001-09-14 07:50-0500\n"
"Last-Translator: D. Dale Gulledge <dsplat@rochester.rr.com>\n"
"Language-Team: Esperanto <eo@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-3\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "instalas %s\n"
@@ -27,34 +27,34 @@ msgstr ""
"A�tomata instalado de paka�oj...\n"
"Vi petis instaladon de paka�o %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "�u tio estas bona?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Jes"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Nuligu"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "JjYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (J/n) "
@@ -611,7 +611,7 @@ msgid "Installation failed on node %s"
msgstr "Instalado malsukcesis"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "Instalado malsukcesis"
@@ -640,8 +640,9 @@ msgstr ""
"�i tiu estas libera programo kaj vi rajtas redistribui �i sub la kondi�oj\n"
"de la GNU GPL."
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
#, fuzzy
msgid " --help - print this help message.\n"
msgstr " --all - printu �iujn etikedojn."
@@ -705,6 +706,164 @@ msgstr "Por plenumi dependa�ojn, la sekvantaj paka�oj estas instalonta (%d mb)"
msgid "Removing failed"
msgstr "reprenas [%s]"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"�i tiu estas libera programo kaj vi rajtas redistribui �i sub la kondi�oj\n"
+"de la GNU GPL."
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - ne printu etikedonomon (defa�lto se neniu etikedo estas"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - printu �iujn etikedojn."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - printu etikedonomon: rpm-an dosieronomon (supozata se "
+"neniu"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - printu etikedan grupon: group."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --group - printu etikedan grandecon: size."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --group - printu etikedan grandecon: size."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --group - printu etikedan resumon: summary."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --group - printu etikedan priskribon: description."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - printu etikedan provizon: �iuj provizoj (pluraj linioj)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - printu etikedan postulon: �iuj postuloj (pluraj linioj)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --files - printu etikedajn dosierojn: �iuj dosieroj (pluraj "
+"linioj)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - printu etikedajn konfliktojn: �iuj konfliktoj (pluraj "
+"linioj)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - printu etikedajn arkaikojn: �iuj arkaikoj (pluraj "
+"linioj)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " --group - printu etikedan grupon: group."
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " --all - printu �iujn etikedojn."
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " --group - printu etikedan grupon: group."
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " --all - printu �iujn etikedojn."
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " --all - printu �iujn etikedojn."
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -939,14 +1098,6 @@ msgstr ""
"�i tiu estas libera programo kaj vi rajtas redistribui �i sub la kondi�oj\n"
"de la GNU GPL."
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1074,40 +1225,40 @@ msgstr "urpmi: nekonata opcio \"-%s\", kontrolu uzadon kun \"--help\"\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "ne povis �uste analizi [%s] je valoro \"%s\""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
#, fuzzy
msgid "Only superuser is allowed to install packages"
msgstr "Nur superuzulo rajtas instali lokajn paka�ojn"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Unu el la sekvantaj paka�oj estas bezonata por instali %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Unu el la sekvantaj paka�oj estas bezonata:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Kiu estas via elekto? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Beda�rinde, nevalida elekto, reprovu\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1115,31 +1266,31 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "Nur superuzulo rajtas instali lokajn paka�ojn"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1149,49 +1300,49 @@ msgstr ""
"Por �isdatigi, iu paka�o devas esti forprenata. �i tiu ne jam estas "
"subtenata.\n"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr "Por plenumi dependa�ojn, la sekvantaj paka�oj estas instalonta (%d mb)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "Ne povas preni fontajn paka�ojn. Mi �esi�as."
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Bonvole en�ovu la medion nomata \"%s\" en aparato [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "Premu la enigklavon kiam �i estas finata..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "La sekvantaj paka�oj enhavas %s: %s"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
#, fuzzy
msgid " (y/N) "
msgstr " (J/n) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1199,25 +1350,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Instalado malsukcesis"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "instalas %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Provu instaladon sen kontroli dependa�ojn? (j/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Provu instaladon e� pli forte (--force)? (j/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "�io jam instalita"
@@ -1234,10 +1385,6 @@ msgstr ""
"�i tiu estas libera programo kaj vi rajtas redistribui �i sub la kondi�oj\n"
"de la GNU GPL."
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
#, fuzzy
msgid " --list - list available packages.\n"
@@ -1301,10 +1448,6 @@ msgstr " --group - printu etikedan grupon: group."
msgid " -r - print version and release with name also.\n"
msgstr " etikedo donata en ordonolinio sed sen paka�nomo)."
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 648532b4..a31c7e42 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2003-01-17 08:41-0300\n"
"Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
"Language-Team: Spanish <cooker-i18n@linux-mandrake.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.5\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "instalando %s\n"
@@ -31,34 +31,34 @@ msgstr ""
"Instalaci�n autom�tica de paquetes...\n"
"Pidi� la instalaci�n del paquete %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "�Est� todo bien?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Aceptar"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Cancelar"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "SsYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (S/n) "
@@ -616,7 +616,7 @@ msgid "Installation failed on node %s"
msgstr "Fall� la instalaci�n en el nodo %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "Es posible la instalaci�n"
@@ -648,8 +648,9 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - imprime este mensaje de ayuda.\n"
@@ -715,6 +716,176 @@ msgstr ""
msgid "Removing failed"
msgstr "Fall� la desinstalaci�n"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urmpq versi�n %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Esto es software libre y se debe redistribuir bajo los t�rminos de la "
+"licencia p�blica general GNU.\n"
+"\n"
+"uso:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - usa s�lo soporte de actualizaci�n.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - usa s�lo soportes listados por coma.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+" --synthesis - usar la s�ntesis provista en vez de la base de datos de "
+"urpmi.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - modo informativo.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - no imprime nombre de etiqueta (por defecto si no hay "
+"etiq."
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - imprime todas las etiquetas."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - imprime nombre etiq.: nombre arch. rpm (se asume sin"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - imprime etiqueta de grupo: group."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - imprime etiqueta de tama�o: size."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - imprime etiqueta de tama�o: size."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - imprime etiqueta resumen: summary."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - imprime etiqueta de descripci�n: description."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - imprime etiq. provides: todo que proporciona (l�n. "
+"m�lt.)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - imprime etiq. requires: todo que precisa (l�n. m�lt.)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --files - imprime etiq. archivos: todos archivos (l�n. m�lt.)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - imprime etiq. conflicts: todos conflictos (l�n. m�lt.)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - imprime etiq. obsoletes: todo obsoleto (l�n. m�lt.)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - fuerza generaci�n de archivos hdlist.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - imprime versi�n, liberaci�n y arq con nombre.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - limpia dir. encabezados de cache.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - borra paquete si hay versi�n m�s reciente instalada.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - borra paquete si hay versi�n m�s reciente instalada.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+" -a - selecciona todas los paquetes que coincidan con la "
+"expresi�n.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+" -a - selecciona todas los paquetes que coincidan con la "
+"expresi�n.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -957,14 +1128,6 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - usa s�lo soporte de actualizaci�n.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - usa s�lo soportes listados por coma.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1106,39 +1269,39 @@ msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
"Lo que se puede hacer con archivos rpm binarios utilizando --install-src"
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "No se puede crear el directorio [%s] para reporte de bugs"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr "uasando un entorno espec�fico en %s\n"
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "S�lo el superusuario est� autorizado a instalar paquetes"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Uno de los paquetes siguientes es necesario para instalar %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Uno de los paquetes siguientes es necesario:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "�Qu� elige? (1-%d)"
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Disculpe, elecci�n incorrecta, reint�ntelo\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1149,31 +1312,31 @@ msgstr ""
"%s\n"
"�est� de acuerdo?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "no se puede instalar el paquete %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "no se encuentra wget\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s est� en conflicto con %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1184,7 +1347,7 @@ msgstr ""
"%s\n"
"�est� de acuerdo?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1192,7 +1355,7 @@ msgid ""
msgstr ""
"Para resolver las dependencias, se instalar�n los paquetes siguientes (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1201,32 +1364,32 @@ msgstr ""
"Necesita ser root para instalar las dependencias siguientes:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "no se pueden obtener los paquetes fuente, abortando"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Por favor, inserte el soporte denominado �%s� en el dispositivo [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Presione �Intro� cuando est� listo..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Los siguientes paquetes contienen firmas no v�lidas"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "�Desea continuar con la instalaci�n?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1237,25 +1400,25 @@ msgstr ""
"%s\n"
"Puede querer actualizar su base de datos de urpmi"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Fall� la instalaci�n"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "distribuyendo %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "�Intentar de instalar sin verificar las dependencias? (s/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "�Intentar con m�s fuerza la instalaci�n (--force)? (s/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "ya est� todo instalado"
@@ -1276,12 +1439,6 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-" --synthesis - usar la s�ntesis provista en vez de la base de datos de "
-"urpmi.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - lista los paquetes disponibles.\n"
@@ -1342,10 +1499,6 @@ msgstr " -g - imprimir los grupos junto con los nombres.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - imprimir versi�n y revisi�n junto con el nombre.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - imprime versi�n, liberaci�n y arq con nombre.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
@@ -1544,12 +1697,6 @@ msgstr "no se encontr� la lista completa de soportes"
#~ msgid "problem reading hdlist file, trying again"
#~ msgstr "problema al leer el archivo hdlist, se intenta de nuevo"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - borra paquete si hay versi�n m�s reciente instalada.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr "soporte �%s� intenta utilizar una lista ya usada, soporte ignorado"
diff --git a/po/et.po b/po/et.po
index ba60eb1c..0b1835b0 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-22 13:48+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2003-01-15 15:23+0200\n"
"Last-Translator: Marek Laane <bald@online.ee>\n"
"Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -650,8 +650,9 @@ msgstr ""
"\n"
"kasutamine:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - selle abiteate näitamine.\n"
@@ -712,6 +713,167 @@ msgstr "Sõltuvuste lahendamiseks tuleb eemaldada järgmised paketid (%d MB)"
msgid "Removing failed"
msgstr "Eemaldamine ebaõnnestus"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq versioon %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+"Litsentsi tingimustele.\n"
+"\n"
+"kasutamine:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - ainult andmekandja uuendamine.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+" --media - ainult määratud andmekandja(te) kasutamine (eraldajaks "
+"koma).\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr " --synthesis - sünteesi kasutamine urpmi andmebaasi asemel.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - selgitav resiim.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - välja nime ei näidata (vaikimisi, kui välja ei ole antud "
+"käsureal, "
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - näitab kõiki välju."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - näitab välja name: rpm-faili nimi (eeldatavalt, kui "
+"välja ei ole "
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - näitab välja group: grupp."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - näitab välja size: suurus."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - näitab välja size: suurus."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - näitab välja summary: kokkuvõte."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - näitab välja description: kirjeldus."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides - näitab välja provides: kõik pakutavad (mitu rida)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - näitab välja requires: kõik nõutavad (mitu rida)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - näitab välja files: kõik failid (mitu rida)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - näitab välja conflicts: kõik konfliktid (mitu rida)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr " --obsoletes - näitab välja obsoletes: kõik iganenud (mitu rida)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - sunnib genereerima hdlist-faile.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+" -f - näitab koos nimega versiooni, väljalaset ja "
+"arhitektuuri.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - puhastab päistepuhvri kataloogi.\n"
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -f - sunnib genereerima hdlist-faile.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - valib kõik käsureaga sobivad paketid.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - valib kõik käsureaga sobivad paketid.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -953,16 +1115,6 @@ msgstr ""
"\n"
"kasutamine:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - ainult andmekandja uuendamine.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-" --media - ainult määratud andmekandja(te) kasutamine (eraldajaks "
-"koma).\n"
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - sünteesi kasutamine urpmi andmebaasi asemel.\n"
@@ -1268,10 +1420,6 @@ msgstr ""
"\n"
"kasutamine:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr " --synthesis - sünteesi kasutamine urpmi andmebaasi asemel.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - saadaolevate pakettide loend.\n"
@@ -1334,12 +1482,6 @@ msgstr " -g - näitab koos nimega ka gruppi.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - näitab koos nimega ka versiooni ja väljalaset.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-" -f - näitab koos nimega versiooni, väljalaset ja "
-"arhitektuuri.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " päring esitatakse käsureal antud nimede või rpm-failide kohta.\n"
diff --git a/po/eu.po b/po/eu.po
index d956197e..643ad4ad 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-09-09 19:28+0200\n"
"Last-Translator: I�igo Salvador Azurmendi <xalba@euskalnet.net>\n"
"Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.6\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "%s instalatzen\n"
@@ -28,34 +28,34 @@ msgstr ""
"Paketeak automatikoki instalatzen...\n"
"%s paketea instalatzea eskatu duzu\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Ados zaude?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Ados"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Utzi"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "eENn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "bBYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr "(B/e) "
@@ -629,7 +629,7 @@ msgid "Installation failed on node %s"
msgstr "Instalazioak %s nodoan huts egin du"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "Instalazioak egin daiteke"
@@ -661,8 +661,9 @@ msgstr ""
"\n"
"erabili:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - laguntza-mezu hau inprimatzen du.\n"
@@ -732,6 +733,181 @@ msgstr ""
msgid "Removing failed"
msgstr "...huts egin du kopiatzean"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq-ren %s bertsioa\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Software librea da eta birbana daiteke GNU GPLen ezarritako baldintzak betez "
+"gero.\n"
+"\n"
+"erabili:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - euskarri eguneratua bakarrik erabiltzen du.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+" --media - komaz bereizitako euskarriak bakarrik erabiltzen ditu.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+" - synthesis - erabili adierazitako sintesia urpmi db erabili beharren.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - modu xehetua.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - ez du etiketaren izena inprimatzen (lehenetsia da komando-"
+"lerroan etiketarik ez badago;"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - etiketa guztiak inprimatzen ditu."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - etiketaren izena inprimatzen du: rpm fitxategi-izena "
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - etiketaren taldea inprimatzen du: taldea."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - etiketaren tamaina inprimatzen du: tamaina."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - etiketaren tamaina inprimatzen du: tamaina."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - etiketaren laburpena inprimatzen du: laburpena."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - etiketaren azalpena inprimatzen du: azalpena."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - etiketa-hornitzaileak inprimatzen ditu: hornitzaile "
+"guztiak (lerro anitz)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - etiketaren eskakizunak inprimatzen ditu: eskakizun "
+"guztiak (lerro anitz)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --files - etiketa-fitxategiak inprimatzen ditu: fitxategi "
+"guztiak (lerro anitz)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - etiketa-gatazkak inprimatzen ditu: gatazka guztiak "
+"(lerro anitz)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - etiketa zaharkituak inprimatzen ditu: zaharkitu guztiak "
+"(lerro anitz)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr ""
+" -f - goiburuko-zerrendaren fitxategiak sortzera behartzen du.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+" -f - bertsioa, argitalpena eta fitxategia ere izenarekin "
+"inprimatzen ditu.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - goiburukoen cache-direktorioa garbitzen du.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - paketea kentzen du bertsio hobea instalatuta badago.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - paketea kentzen du bertsio hobea instalatuta badago.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+" -a - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+" -a - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -981,15 +1157,6 @@ msgstr ""
"\n"
"erabili:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - euskarri eguneratua bakarrik erabiltzen du.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-" --media - komaz bereizitako euskarriak bakarrik erabiltzen ditu.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1139,39 +1306,39 @@ msgstr ""
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "ezin da akatsen txostenak uzteko [%s] direktorioa sortu"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Supererabiltzaileak bakarrik du pakete lokalak instalatzeko baimena"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "%s instalatzeko, ondoko paketeetako bat behar da:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Ondoko paketeetako bat behar da:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Zein aukeratu duzu? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Lastima, aukera okerra, saiatu berriro\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1182,31 +1349,31 @@ msgstr ""
"%s\n"
"ados zaude?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "ezin da %s paketea instalatu"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget ez dago\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s-k %s-rekin gatazka sortzen du"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1217,7 +1384,7 @@ msgstr ""
"%s\n"
"ados zaude?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1226,7 +1393,7 @@ msgstr ""
"Mendekotasun guztiak behar bezala lagatzeko, ondoko paketeak instalatuko dira"
"(%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1235,32 +1402,32 @@ msgstr ""
"root izan behar duzu ondorengo menpekotasunak instalatzeko:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "ezin dira iturburuko paketeak lortu, abortatzen"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "\"%s\" izeneko euskarria [%s] gailuan sartu"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Prest zaudenean sakatu Sartu..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Ondorengo paketeek sinadura okerrak dituzte"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Instalazioarekin aurrera egin nahi duzu ?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr "(b/E) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1270,25 +1437,25 @@ msgstr ""
"Huts egin du instalatzean, fitxategi batzuk falta dira.\n"
"Zure urpmi datu-basea eguneratzea nahiko duzu "
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Instalazioak huts egin du"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "%s banatzen\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Mendekotasunak egiaztatu gabe instalatzen saiatu nahi duzu? (B/e) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Areago instalatzen saiatu (--force)? (b/E) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "dena dago instalatuta"
@@ -1309,11 +1476,6 @@ msgstr ""
"\n"
"erabili:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-" - synthesis - erabili adierazitako sintesia urpmi db erabili beharren.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - zerrendatu eskuragarri dauden paketeak.\n"
@@ -1382,12 +1544,6 @@ msgid " -r - print version and release with name also.\n"
msgstr ""
" -r - inprimatu bertsioa eta askapena izenarekin batera.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-" -f - bertsioa, argitalpena eta fitxategia ere izenarekin "
-"inprimatzen ditu.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " komando-lerroko izenak edo rpm-fitxategiak kontsultatu dira.\n"
@@ -1660,12 +1816,6 @@ msgstr "ez da euskarri-zerrenda osorik aurkitu"
#~ msgid "keeping only files referenced in provides"
#~ msgstr "hornitzaileetan aipatutako fitxategiak bakarrik mantentzen"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - paketea kentzen du bertsio hobea instalatuta badago.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr ""
#~ "\"%s\" euskarriak erabilitako zerrenda bat erabili nahi du; jaramonik ez "
diff --git a/po/fi.po b/po/fi.po
index 653e8067..0ec9422a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi-fi - MDK Release 9.1\n"
-"POT-Creation-Date: 2003-01-20 13:28+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2003-01-18 21:35+0200\n"
"Last-Translator: Thomas Backlund <tmb@iki.fi>\n"
"Language-Team: Finnish <cooker-i18n@linux-mandrake.com>\n"
@@ -648,8 +648,9 @@ msgstr ""
"\n"
"käyttö:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - tulosta tämä viesti.\n"
@@ -708,6 +709,175 @@ msgstr "Riippuvuuksien täyttämiseksi seuraavat paketit poistetaan (%d Mt)"
msgid "Removing failed"
msgstr "Poistaminen epäonnistui"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq versio %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Tämä on vaapaata ohjelmistoa, joka saadaan levittää GNU GPL lisenssin "
+"mukaisesti.\n"
+"\n"
+"käyttö:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - käytä ainoastaan päivitysmediaa.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+" --media - käytä ainoastaan seuraava(t) media(t) pilkulla "
+"erotettuina.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+" --synthesis - käytä annettu synthesis tiedostoa urpmi tietokannan "
+"sijasta.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - yksityiskohtainen tyyli.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - jätä merkintänimi tulostamatta (vakio jos ei merkintä "
+"komento"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - tulosta kaikki merkinnät."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - tulosta merkintänimi: rpm tiedostonimi (oletettu jos ei"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - tulosta merkintä ryhmä: ryhmä."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - tulosta merkintä koko: koko."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - tulosta merkintä koko: koko."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - tulosta merkintä yhteenveto: yhteenveto."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - tulosta merkintä kuvaus: kuvaus."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - tulosta merkintä tarjoaa: kaikki tarjoaa (moni-rivinen)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - tulosta merkintä tarvitsee: kaikki tarvitsee (moni-"
+"rivinen)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --files - tulosta merkintä tiedostot: kaikki tiedostot (moni-"
+"rivinen)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - tulosta merkintä ristiriita: kaikki ristiriidat (moni-"
+"rivinen)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - tulosta merkintä vanhentaa: vanhentaa kaikki (moni-"
+"rivinen)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - pakota hdlist tiedostojen luominen.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+" -f - tulosta versio, julkaisu ja arkkitehtuuri myös nimellä.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - puhdista otsikkotietojen välimuistihakemisto.\n"
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -f - pakota hdlist tiedostojen luominen.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - valitse kaikki yhteensopivuuksia kommentojonossa.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - valitse kaikki yhteensopivuuksia kommentojonossa.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -953,16 +1123,6 @@ msgstr ""
"\n"
"käyttö:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - käytä ainoastaan päivitysmediaa.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-" --media - käytä ainoastaan seuraava(t) media(t) pilkulla "
-"erotettuina.\n"
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1279,12 +1439,6 @@ msgstr ""
"\n"
"käyttö:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-" --synthesis - käytä annettu synthesis tiedostoa urpmi tietokannan "
-"sijasta.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - listaa käytettävissä olevat paketit.\n"
@@ -1346,11 +1500,6 @@ msgstr " -g - tulosta ryhmät myös nimellä.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - tulosta versio ja julkaisu myös nimellä.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-" -f - tulosta versio, julkaisu ja arkkitehtuuri myös nimellä.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " nimet tai rpm-tiedostot komentorivissä on etsitty.\n"
diff --git a/po/fr.po b/po/fr.po
index 300626ab..ed670ba9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-12-24 11:14+0400\n"
"Last-Translator: Guy CLOTILDE <guy.clotilde@wanadoo.fr>\n"
"Language-Team: <fr@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "installation de %s\n"
@@ -32,34 +32,34 @@ msgstr ""
"Installation automatique des paquetages...\n"
"Vous avez demand� l'installation du paquetage %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Est-ce correct�?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "OK"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Annuler"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "OoYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (O/n) "
@@ -620,7 +620,7 @@ msgid "Installation failed on node %s"
msgstr "L'installation a �chou� sur le noeud %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "L'installation est possible"
@@ -652,8 +652,9 @@ msgstr ""
"\n"
"usage:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - afficher ce message d'aide\n"
@@ -717,6 +718,183 @@ msgstr ""
msgid "Removing failed"
msgstr "Echec de la d�sinstallation"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq version %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ceci est un logiciel libre pouvant �tre redistribu� selon les termes de la "
+"licence GNU GPL.\n"
+"\n"
+"usage:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - n'utilise que les sources de mise � jour.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+" --media - utilise seulement les sources list�es (s�par�s par des\n"
+" virgules).\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+" --synthesis - utilise le fichier de synth�se donn� plut�t que la base\n"
+" de donn�es urpmi.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - mode verbeux.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - ne pas afficher le nom des champs (actif par d�faut si "
+"aucun champ "
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - afficher tous les champs"
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - affiche le champ ��name���: nom du fichier rpm (par d�faut "
+"si aucun champ"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - afficher le champ ��group���: groupe"
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - afficher le champ ��size���: taille."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - afficher le champ ��size���: taille."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - afficher le champ ��summary���: r�sum�."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - afficher le champ ��description���: description."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - afficher le champ ��provides���: tous les apports (multi-"
+"lignes)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - afficher le champ ��requires���: toutes les d�pendances "
+"(multi-lignes)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --files - afficher le champ ��files���: tous les fichiers (multi-"
+"lignes)."
+
+# �
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - afficher le champ ��conflicts���: tous les conflits "
+"(multi-lignes)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - afficher le champ ��obsoletes���: toutes les "
+"obsolescences (multi-lignes)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - forcer la g�n�ration des fichiers hdlist.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+" -f - affiche la version, la release et l'architecture\n"
+" du paquetage avec le nom\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - purger le r�pertoire cache des en-t�tes.\n"
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -f - forcer la g�n�ration des fichiers hdlist.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+" -a - s�lectionne toutes les paquetages correspondants � "
+"l'expression\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+" -a - s�lectionne toutes les paquetages correspondants � "
+"l'expression\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -970,16 +1148,6 @@ msgstr ""
"\n"
"usage:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - n'utilise que les sources de mise � jour.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-" --media - utilise seulement les sources list�es (s�par�s par des\n"
-" virgules).\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1136,39 +1304,39 @@ msgstr ""
"Ce qui peut-�tre fait avec les fichiers binaires rpm avec l'option --install-"
"src"
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "impossible de cr�er le r�pertoire [%s] pour le rapport de bogue"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr "avec environnement sp�cifique sur %s\n"
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Seul l'administrateur syst�me (root) peut installer des paquetages"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "L'un des paquetages suivants est n�cessaire pour installer %s�:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Un des paquetages suivants est n�cessaire�:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Que choisissez-vous�? (1-%d)"
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "D�sol�, mauvais choix, veuillez r�essayez\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1179,31 +1347,31 @@ msgstr ""
"%s\n"
"Etes vous d'accord�?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "impossible d'installer le paquetage %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget n'est pas install�\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s est en conflit avec %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1215,7 +1383,7 @@ msgstr ""
"%s\n"
"Etes-vous d'accord?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1224,7 +1392,7 @@ msgstr ""
"Pour satisfaire les d�pendances, les paquetages suivants vont �tre install�s "
"(%d Mo)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1233,32 +1401,32 @@ msgstr ""
"Vous devez �tre root pour installer les d�pendances suivantes:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "impossible de r�cup�rer les paquetages sources, abandon"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Veuillez ins�rer le medium nomm� ��%s�� dans le p�riph�rique [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Appuyez sur la touche Entr�e quand vous �tes pr�ts..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Les paquetages suivants ont des signatures non valides"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Voulez-vous continuer l'installation�?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (o/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1269,25 +1437,25 @@ msgstr ""
"%s\n"
"Vous devriez mettre � jour votre base de donn�es urpmi"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "L'installation a �chou�"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "distribution de %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Essayer d'installer sans v�rifier les d�pendances�? (o/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Essayer de forcer l'installation (--force)�? (o/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "tout est d�ja install�"
@@ -1308,12 +1476,6 @@ msgstr ""
"\n"
"usage:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-" --synthesis - utilise le fichier de synth�se donn� plut�t que la base\n"
-" de donn�es urpmi.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - montrer tous les paquetages disponibles.\n"
@@ -1379,12 +1541,6 @@ msgstr " -g - afficher les groupes ainsi que les noms\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - affiche la version d�taill�e ainsi que le nom.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-" -f - affiche la version, la release et l'architecture\n"
-" du paquetage avec le nom\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/ga.po b/po/ga.po
index 79496c7e..0f22f5d2 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 1.5\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+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"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "ag feisti� %s\n"
@@ -25,34 +25,34 @@ msgid ""
"You requested installation of package %s\n"
msgstr ""
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "An bhfuil sin Ok ?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Ceart go Leor"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Cealaigh"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "TtYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (T/n) "
@@ -604,7 +604,7 @@ msgid "Installation failed on node %s"
msgstr "Theip ar feisti�"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "Theip ar feisti�"
@@ -631,8 +631,9 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr ""
@@ -693,6 +694,133 @@ msgstr ""
msgid "Removing failed"
msgstr ""
+#: ../urpmf_.c:26
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+
+#: ../urpmf_.c:38
+msgid " --all - print all tags.\n"
+msgstr ""
+
+#: ../urpmf_.c:39
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+
+#: ../urpmf_.c:41
+msgid " --group - print tag group: group.\n"
+msgstr ""
+
+#: ../urpmf_.c:42
+msgid " --size - print tag size: size.\n"
+msgstr ""
+
+#: ../urpmf_.c:43
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr ""
+
+#: ../urpmf_.c:44
+msgid " --summary - print tag summary: summary.\n"
+msgstr ""
+
+#: ../urpmf_.c:45
+msgid " --description - print tag description: description.\n"
+msgstr ""
+
+#: ../urpmf_.c:46
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:47
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:48
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:49
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:50
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:51
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr ""
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+
+#: ../urpmf_.c:57
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:58
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -886,14 +1014,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1013,39 +1133,39 @@ msgstr ""
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr ""
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, fuzzy, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "T� ceann de na pac�ist� seo de dh�th:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "T� ceann de na pac�ist� seo de dh�th:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "C�ard � do rogha? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Droch-rogha, athtrialaigh!\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1053,31 +1173,31 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, c-format
msgid "in order to install %s"
msgstr ""
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1085,49 +1205,49 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr ""
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "Br� Enter nuair at� sin d�anta agat..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "T� %s ins na pac�ist� a leanas: %s \n"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
#, fuzzy
msgid " (y/N) "
msgstr " (T/n) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1135,25 +1255,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Theip ag feisti�"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "ag feisti� %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr ""
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr ""
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "t� gach rud ann cheana f�in"
@@ -1168,10 +1288,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr ""
@@ -1225,10 +1341,6 @@ msgstr ""
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 90181bf4..e75348db 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2000-05-09 23:50+0200\n"
"Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "instalando %s\n"
@@ -26,34 +26,34 @@ msgid ""
"You requested installation of package %s\n"
msgstr ""
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "�Est� ben?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Aceptar"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Cancelar"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "SsYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (S/n) "
@@ -603,7 +603,7 @@ msgid "Installation failed on node %s"
msgstr "A instalaci�n fallou"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "A instalaci�n fallou"
@@ -630,8 +630,9 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr ""
@@ -694,6 +695,133 @@ msgstr ""
msgid "Removing failed"
msgstr ""
+#: ../urpmf_.c:26
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+
+#: ../urpmf_.c:38
+msgid " --all - print all tags.\n"
+msgstr ""
+
+#: ../urpmf_.c:39
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+
+#: ../urpmf_.c:41
+msgid " --group - print tag group: group.\n"
+msgstr ""
+
+#: ../urpmf_.c:42
+msgid " --size - print tag size: size.\n"
+msgstr ""
+
+#: ../urpmf_.c:43
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr ""
+
+#: ../urpmf_.c:44
+msgid " --summary - print tag summary: summary.\n"
+msgstr ""
+
+#: ../urpmf_.c:45
+msgid " --description - print tag description: description.\n"
+msgstr ""
+
+#: ../urpmf_.c:46
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:47
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:48
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:49
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:50
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:51
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr ""
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+
+#: ../urpmf_.c:57
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:58
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -886,14 +1014,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1013,40 +1133,40 @@ msgstr ""
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
#, fuzzy
msgid "Only superuser is allowed to install packages"
msgstr "S� se lle permite � superusuario instalar paquetes locais"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, fuzzy, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Neces�tase un dos seguintes paquetes:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Neces�tase un dos seguintes paquetes:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "�Cal � a s�a elecci�n? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Mala elecci�n, probe de novo\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1054,31 +1174,31 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "S� se lle permite � superusuario instalar paquetes locais"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1086,7 +1206,7 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1095,42 +1215,42 @@ msgstr ""
"Para satisfacer as dependencias, os seguintes paquetes van ser instalados (%"
"d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Por favor, insira o %s nomeado %s"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "Prema enter cando estea..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "Os seguintes paquetes conte�en %s: %s\n"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
#, fuzzy
msgid " (y/N) "
msgstr " (S/n) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1138,25 +1258,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "A instalaci�n fallou"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "instalando %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "�Probar a instalaci�n sen comprobar as dependencias? (s/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "�Probar a instalaci�n con menos comprobaci�ns (--force)? (s/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "xa est� todo instalado"
@@ -1171,10 +1291,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr ""
@@ -1228,10 +1344,6 @@ msgstr ""
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 6576c9a3..fabed28e 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-03-08 13:56CET\n"
"Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.5\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "instaliram %s\n"
@@ -28,34 +28,34 @@ msgstr ""
"Automatska instalacija paketa...\n"
"Zatra�ili ste instalaciju paketa %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Da li se sla�ete s tim?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "U redu"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Odustani"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "YyDd"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (D/n) "
@@ -612,7 +612,7 @@ msgid "Installation failed on node %s"
msgstr "Instalacija nije uspjela"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "Instalacija nije uspjela"
@@ -644,8 +644,9 @@ msgstr ""
"\n"
"uporaba:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - ispi�i ovaj tekst s pomo�i.\n"
@@ -711,6 +712,166 @@ msgstr ""
msgid "Removing failed"
msgstr "...kopiranje neuspje�no"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\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 MandrakeSoft.\n"
+"Ovo je slobodan software i mo�e biti redistribuiran pod stavkama GNU GPLa.\n"
+"\n"
+"uporaba:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - koristi samo medije za dogradnju.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - koristi samo medije popisane zarezom.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - op�iran mod.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - ne ispisuje ime oznake (podrazumijevano ako nije dana "
+"oznaka na komandnoj"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - ispi�i sve oznake."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - ispisuje ime oznake: rpm datoteku (podrazumijeva se ako "
+"nema dane oznake na"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group -ispisuje oznaku group: grupu."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - ispisuje oznaku size: veli�inu."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - ispisuje oznaku size: veli�inu."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - ispisuje oznaku summary: sa�eto."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - ispisuje oznaku description: opis."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - ispisuje oznaku provides: sve �to pru�a (vi�e linija)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - ispisuje oznaku requires: sve �to zahtjeva (vi�e linija)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - ispisuje oznaku files: sve datoteke (vi�e linija)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - ispisuje oznaku conflicts: sve konflikte (vi�e linija)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - ispisuje oznaku obsoletes: sve zastarjele (vi�e linija)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - prisili pravljenje hdlist datoteka.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - ispi�i verziju, izdanje i arhitekturu sa imenom.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - o�isti ke� direktorij zaglavlja.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr " -u - ukloni paket ukoliko bolja ina�ica ve� postoji.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -u - ukloni paket ukoliko bolja ina�ica ve� postoji.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - odabire sve odgovaraju�e na komandnoj liniji.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - odabire sve odgovaraju�e na komandnoj liniji.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -943,14 +1104,6 @@ msgstr ""
"\n"
"uporaba:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - koristi samo medije za dogradnju.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - koristi samo medije popisane zarezom.\n"
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1081,39 +1234,39 @@ msgstr "urpmi: nepoznata opcija \"-%s\", provjerite uporabu sa --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "ne mogu obraditi ispravno [%s] na vrijednosti \"%s\""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Samo je administratoru dozvoljeno da instalira pakete"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Jedan od slijede�ih paketa je potreban za instaliranje %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Jedan od slijede�ih paketa je potreban:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Izaberite jedan? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "�alim, lo� odabir, poku�ajte ponovo\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1121,31 +1274,31 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "Samo je administratoru dozvoljeno da instalira pakete"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget nedostaje\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1155,7 +1308,7 @@ msgstr ""
"neki paketi moraju biti uklonjeni da bi mogli biti nadogra�eni, ovo jo� "
"uvijek nije podr�ano\n"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1164,7 +1317,7 @@ msgstr ""
"Kako bi zadovoljili sve ovisnosti paketa slijede�i moram instalirati "
"slijede�e pakete (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1173,34 +1326,34 @@ msgstr ""
"Morate biti administrator(root) kako bi instalirali slijede�e ovisnosti:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "ne mogu dohvatiti izvorne (source) pakete, prekidam"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Molim umetnite medij pod nazivom \"%s\" u ure�aj [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "Pritisnite Enter kada ste gotovi..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "Slijede�i paketi sadr�e %s: %s"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (d/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1210,25 +1363,25 @@ msgstr ""
"Instalacija neuspje�na, neke datoteke nedostaju.\n"
"Mo�da �ete po�eljeti dograditi va�u urpmi bazu"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Instalacija nije uspjela"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "instaliram %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Poku�ati instalaciju bez provjere ovisnosti (d/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Poku�ati instalaciju jo� sna�nije (--force)? (d/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "sve je ve� instalirano"
@@ -1248,10 +1401,6 @@ msgstr ""
"\n"
"uporaba:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
#, fuzzy
msgid " --list - list available packages.\n"
@@ -1318,10 +1467,6 @@ msgstr " -g - ispi�i groupe tako�er sa imenom.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - ispi�i verzije i izdanja tako�er sa imenom.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - ispi�i verziju, izdanje i arhitekturu sa imenom.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
@@ -1703,12 +1848,6 @@ msgstr "nije prona�en popis punih medija"
#~ msgid "problem reading hdlist file, trying again"
#~ msgstr "problem prilikom �itanja hdlist datoteke, poku�avam opet"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - ukloni paket ukoliko bolja ina�ica ve� postoji.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr ""
#~ "medij \"%s\" poku�ava koristiti ve� kori�teni popis, medij ignoriran"
diff --git a/po/hu.po b/po/hu.po
index efa7896d..c53b6027 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-08-31 16:53+0000\n"
"Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
"Language-Team: Hungarian\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.6\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "%s telep�t�se folyamatban\n"
@@ -31,34 +31,34 @@ msgstr ""
"A csomagok automatikus telep�t�se...\n"
"A(z) %s csomag telep�t�s�t k�rte...\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "�gy rendben van?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "OK"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "M�gsem"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "IiyY"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (I/n) "
@@ -632,7 +632,7 @@ msgid "Installation failed on node %s"
msgstr "A telep�t�s nem siker�lt ezen a g�pen: %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "A telep�t�s elv�gezhet�"
@@ -663,8 +663,9 @@ msgstr ""
"\n"
"Haszn�lat:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - jelen seg�ts�g megjelen�t�se\n"
@@ -733,6 +734,172 @@ msgstr ""
msgid "Removing failed"
msgstr "...a m�sol�s sikertelen"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\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, 2001, 2002 MandrakeSoft.\n"
+"Ez a program szabad szoftver; a GNU GPL felt�telei szerint terjeszthet�.\n"
+"\n"
+"Haszn�lat:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - csak friss�t�si adatforr�s legyen haszn�lva\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+" --media - csak a felsorolt (elv�laszt�s: vessz�) adatforr�sok\n"
+" haszn�lata\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+" --synthesis - a megadott kiterjesztett f�gg�s�glista haszn�lata az\n"
+" urpmi-adatb�zis helyett\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - r�szletes inform�ci�\n"
+
+# maxim�lis sorhossz: 80 karakter (karakteres termin�l sorhossza)
+# "." ne legyen a sztringek v�g�n
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - c�mke ki�r�s�nak elhagy�sa (ha nincs c�mke a "
+"parancssorban,"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - az �sszes adat megjelen�t�se"
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - n�v megjelen�t�se (ha nincs megadva c�mke a "
+"parancssorban,"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - csoport megjelen�t�se"
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - m�ret megjelen�t�se"
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - m�ret megjelen�t�se"
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - �sszefoglal� megjelen�t�se"
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - le�r�s megjelen�t�se"
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides - szolg�ltat�sjegyz�k megjelen�t�se (t�bb sor)"
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - k�vetelm�nyek megjelen�t�se (t�bb sor)"
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - f�jlnevek megjelen�t�se (t�bb sor)"
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr " --conflicts - �tk�z�sek megjelen�t�se (t�bb sor)"
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr " --obsoletes - t�lhaladott csomagok megjelen�t�se (t�bb sor)"
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - fejl�clista-f�jlok l�trehoz�s�nak kik�nyszer�t�se\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+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"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - a fejl�cgyorst�r k�nyvt�r�nak ki�r�t�se\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - csomag kihagy�sa, ha m�r van �jabb verzi� telep�tve\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - csomag kihagy�sa, ha m�r van �jabb verzi� telep�tve\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - kijel�l�s a parancssorban megadott minta szerint\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - kijel�l�s a parancssorban megadott minta szerint\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -974,16 +1141,6 @@ msgstr ""
"\n"
"Haszn�lat:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - csak friss�t�si adatforr�s legyen haszn�lva\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-" --media - csak a felsorolt (elv�laszt�s: vessz�) adatforr�sok\n"
-" haszn�lata\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1138,41 +1295,41 @@ msgstr ""
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, 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\""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Csomagok telep�t�s�hez rendszergazdai jogosults�g sz�ks�ges"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "A k�vetkez� csomagok valamelyik�re sz�ks�g van a(z) %s telep�t�s�hez:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "A k�vetkez� csomagok valamelyik�re sz�ks�g van:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Melyiket v�lasztja? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Ezt nem lehet v�lasztani, pr�b�lja meg �jra\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1183,31 +1340,31 @@ msgstr ""
"%s\n"
"Egyet�rt ezzel?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "a(z) \"%s\" csomag telep�t�se sikertelen"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "a wget nem tal�lhat�\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s �tk�zik ezzel: %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1218,7 +1375,7 @@ msgstr ""
"%s\n"
"Egyet�rt ezzel?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1226,7 +1383,7 @@ msgid ""
msgstr ""
"A f�gg�s�gek felold�s�hoz a k�vetkez� csomagokat fogom telep�teni (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1235,32 +1392,32 @@ msgstr ""
"A k�vetkez� f�gg�s�gek telep�t�s�hez rendszergazdai jogosults�g sz�ks�ges:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "a forr�scsomagok nem �rhet�k el, ez�rt a m�velet f�lbeszakad"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Helyezze be a(z) \"%s\" nev� adathordoz�t a(z) \"%s\" meghajt�ba"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Amikor elk�sz�lt, nyomja le az Enter billenty�t..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "A k�vetkez� csomagok helytelen al��r�st tartalmaznak:"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Szeretn� folytatni a telep�t�st?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (i/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1270,25 +1427,25 @@ msgstr ""
"A telep�t�s nem siker�lt, mivel bizonyos f�jlok hi�nyoznak.\n"
"�rdemes lehet friss�teni az urpmi adatb�zist."
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "A telep�t�s nem siker�lt"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "%s eloszt�sa\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Pr�b�ljam meg a telep�t�st a f�gg�s�gek ellen�rz�se n�lk�l? (i/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Mindenk�ppen megk�s�reljem a telep�t�st (--force)? (i/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "m�r minden telep�tve van"
@@ -1308,12 +1465,6 @@ msgstr ""
"\n"
"Haszn�lat:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-" --synthesis - a megadott kiterjesztett f�gg�s�glista haszn�lata az\n"
-" urpmi-adatb�zis helyett\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - az el�rhet� csomagok list�z�sa\n"
@@ -1378,12 +1529,6 @@ 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"
-#: ../urpmq_.c:72
-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"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
@@ -1579,12 +1724,6 @@ msgstr "teljes adatforr�slista nem tal�lhat�"
#~ msgid "problem reading hdlist file, trying again"
#~ msgstr "hiba a fejl�clista olvas�sakor; �jabb pr�b�lkoz�s..."
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - csomag kihagy�sa, ha m�r van �jabb verzi� telep�tve\n"
-
#~ msgid "medium \"%s\" tries 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 "
diff --git a/po/id.po b/po/id.po
index de8739fd..a4d44371 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-09-03 22:24+0900\n"
"Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
"Language-Team: Indonesian <rac@linux-mandrake.com>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "instalasi %s\n"
@@ -27,34 +27,34 @@ msgstr ""
"Instalasi paket otomatis...\n"
"Anda telah meminta instalasi paket %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Semua beres?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Ok"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Batal"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "TtNn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "Yy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (Y/t) "
@@ -607,7 +607,7 @@ msgid "Installation failed on node %s"
msgstr "Instalasi gagal di node %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "Instalasi dimungkinkan"
@@ -638,8 +638,9 @@ msgstr ""
"\n"
"pemakaian:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - cetak pesan pertolongan ini.\n"
@@ -705,6 +706,163 @@ msgstr ""
msgid "Removing failed"
msgstr "...gagal disalin"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq versi %s\n"
+"Haksalin (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ini adalah perangkat lunak gratis dan boleh disebar sesuai GNU GPL.\n"
+"\n"
+"usage:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - pakai hanya media update.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - pakai hanya media terdaftar dg koma.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr " --synthesis - gunakan synthesis yang diberikan, bukan db urpmi.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - mode detil.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - jangan cetak nama tag (standar jika tiada tag pada baris"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - cetak semua tag."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - cetak nama tag: rpm namafile (jika tiada diberikan pada"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - cetak grup tag: grup."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - cetak ukuran tag: ukuran."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - cetak ukuran tag: ukuran."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - cetak ringkasan tag: ringkasan."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - cetak penjelasan tag: penjelasan."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides - cetak sediaan tag: semua sediaan (bbrp baris)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - cetak kebutuhan tag: semua kebutuhan (bbrp baris)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - cetak file tag: semua file (bbrp baris)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr " --conflicts - cetak konflik tag: semua konflik (bbrp baris)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - cetak kadaluarsa tag: semua kadaluarsa (bbrp baris)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - paksa buat file hdlist.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - cetak versi, release dan arch dg nama.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - bersihkan direktori cache header.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - hapus paket jika versi yg lebih baik telah diinstal.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - hapus paket jika versi yg lebih baik telah diinstal.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - pilih semua yg cocok dg baris perintah.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - pilih semua yg cocok dg baris perintah.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -935,14 +1093,6 @@ msgstr ""
"\n"
"pemakaian:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - pakai hanya media update.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - pakai hanya media terdaftar dg koma.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1076,39 +1226,39 @@ msgstr "urpmi: opsi \"-%s\" tak dikenal, cek pemakaian dg --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "gagal membuat direktori [%s] untuk laporan kutu"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Hanya superuser yang boleh meng-instal paket"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Salah satu paket berikut dibutuhkan utk instalasi %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Salah satu paket berikut dibutuhkan:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Pilihan Anda? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Salah pilih, coba lagi\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1119,31 +1269,31 @@ msgstr ""
"%s\n"
"Setuju ?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "gagal menginstal paket %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget hilang\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s konflik dg %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1154,7 +1304,7 @@ msgstr ""
"%s\n"
"Anda setuju?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1162,7 +1312,7 @@ msgid ""
msgstr ""
"Paket berikut akan di-install agar syarat ketergantungan terpenuhi (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1171,32 +1321,32 @@ msgstr ""
"Anda perlu jadi root untuk menginstal ketergantungan berikut:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "tak dapat mengambil paket asal, batal"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Masukkan media \"%s\" ke perangkat [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Tekan [Enter] jika siap.."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Paket berikut berisi tandatangan tak benar"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Teruskan instalasi ?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (y/T) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1206,25 +1356,25 @@ msgstr ""
"Instalasi gagal, beberapa file hilanga.\n"
"Anda mungkin perlu meng-update database urpmi"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Instalasi gagal"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "sebarkan %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Coba instalasi tanpa cek ketergantungan? (y/T) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Coba instalasi lebih keras (--force)? (y/T) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "semua telah terinstal"
@@ -1244,10 +1394,6 @@ msgstr ""
"\n"
"usage:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr " --synthesis - gunakan synthesis yang diberikan, bukan db urpmi.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - daftar paket tersedia.\n"
@@ -1308,10 +1454,6 @@ msgstr " -g - cetak grup dg nama juga.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - juga cetak versi dan release dg nama.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - cetak versi, release dan arch dg nama.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " dicarikan nama atau file rpm yg tertera pada baris perintah.\n"
@@ -1572,12 +1714,6 @@ msgstr "tak ditemukan daftar media lengkap"
#~ msgid "keeping only files referenced in provides"
#~ msgstr "hanya simpan file yg tertulis di sediaan (provides)"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - hapus paket jika versi yg lebih baik telah diinstal.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr "media \"%s\" mencoba memakai list yg telah dipakai, media diabaikan"
diff --git a/po/is.po b/po/is.po
index 9a9af4de..6cc8f56f 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2000-04-19 23:05-0400\n"
"Last-Translator: Thorarinn R. Einarsson <thori@mindspring.com>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "Set inn %s\n"
@@ -26,34 +26,34 @@ msgid ""
"You requested installation of package %s\n"
msgstr ""
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Er �a� � lagi?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "� lagi"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "H�tta vi�"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "JjYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (J/n) "
@@ -603,7 +603,7 @@ msgid "Installation failed on node %s"
msgstr "Innsetning br�st"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "Innsetning br�st"
@@ -630,8 +630,9 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr ""
@@ -694,6 +695,133 @@ msgstr ""
msgid "Removing failed"
msgstr ""
+#: ../urpmf_.c:26
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+
+#: ../urpmf_.c:38
+msgid " --all - print all tags.\n"
+msgstr ""
+
+#: ../urpmf_.c:39
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+
+#: ../urpmf_.c:41
+msgid " --group - print tag group: group.\n"
+msgstr ""
+
+#: ../urpmf_.c:42
+msgid " --size - print tag size: size.\n"
+msgstr ""
+
+#: ../urpmf_.c:43
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr ""
+
+#: ../urpmf_.c:44
+msgid " --summary - print tag summary: summary.\n"
+msgstr ""
+
+#: ../urpmf_.c:45
+msgid " --description - print tag description: description.\n"
+msgstr ""
+
+#: ../urpmf_.c:46
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:47
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:48
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:49
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:50
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:51
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr ""
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+
+#: ../urpmf_.c:57
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:58
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -886,14 +1014,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1013,39 +1133,39 @@ msgstr ""
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr ""
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, fuzzy, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Krefst einnig eins af af eftirt�ldum p�kkum:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Krefst einnig eins af af eftirt�ldum p�kkum:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Hva� viltu? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Sl�mt val. Reyndu aftur\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1053,31 +1173,31 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, c-format
msgid "in order to install %s"
msgstr ""
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1085,7 +1205,7 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1094,42 +1214,42 @@ msgstr ""
"Til a� uppfylla innsetningarkr�fur ver�a eftirtaldir pakkar settir inn (%d "
"MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Vinsamlega settu inn %s %s"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "Sl��u � ENTER eftir�..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "Eftirfarandi pakkar innihalda %s: %s\n"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
#, fuzzy
msgid " (y/N) "
msgstr " (J/n) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1137,25 +1257,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Innsetning br�st"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "Set inn %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Pr�fa innsetningu �n �ess a� athuga hva�a skr�r �arf? (j/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Pr�fa sterkari innsetningu (--force)? (j/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "Allt er n� �egar komi� inn"
@@ -1170,10 +1290,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr ""
@@ -1227,10 +1343,6 @@ msgstr ""
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 1529eab1..278baec9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-09-04 19:04+0200\n"
"Last-Translator: Roberto Rosselli Del Turco <rosselli@ling.unipi.it>\n"
"Language-Team: Italian <it@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "sto installando %s\n"
@@ -30,34 +30,34 @@ msgstr ""
"Installazione automatica dei pacchetti...\n"
"Hai richiesto l'installazione del pacchetto %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "E' corretto?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Ok"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Cancella"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "SsYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (S/n) "
@@ -614,7 +614,7 @@ msgid "Installation failed on node %s"
msgstr "Installazione fallita sul nodo %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "L'installazione � possibile"
@@ -646,8 +646,9 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - stampa questo messaggio di aiuto.\n"
@@ -715,6 +716,169 @@ msgstr ""
msgid "Removing failed"
msgstr "...copia fallita"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq versione %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Questo � software gratuito e pu� essere ridistribuito sotto i termini della "
+"GNU GPL.\n"
+"\n"
+"uso:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr "--update - usa solo media di aggiornamento.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+" --media - usa solo i media nella lista, separati da virgole.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+" --synthesis - utilizza la synthesis specificata invece del db urpmi.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - modalit� prolissa.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - non stampare il nome del tag (default senza tag in riga"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - stampa tutti i tag."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - stampa il nome del tag: rpm filename (supposto senza tag"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - stampa il gruppo del tag: group."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - stampa la dimensione del tag: size."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - stampa la dimensione del tag: size."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --sommario - stampa il sommario del tag: summary."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --descrizione - stampa la descrizione del tag: description."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides - stampa i tag provides: all provides (pi� linee)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - stampa i tag requires: all requires (pi� linee)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - stampa i tag files: all files (pi� linee)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - stampa i conflitti del tag: all conflicts (pi� linee)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr " --obsoletes - stampa i tag obsoletes: all obsoletes (pi� linee)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - forza la generazione degli hdlist file.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+" -f - stampa versione, release e architettura con il nome.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - ripulisci la cache directory delle intestazioni.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - rimuovi i pacchetti se una versione migliore � gi� "
+"installata.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - rimuovi i pacchetti se una versione migliore � gi� "
+"installata.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - seleziona tutti i match da riga di comando.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - seleziona tutti i match da riga di comando.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -952,15 +1116,6 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr "--update - usa solo media di aggiornamento.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-" --media - usa solo i media nella lista, separati da virgole.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1111,39 +1266,39 @@ msgstr "urpmq: opzione sconosciuta \"-%s\", controlla l'uso con --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Impossibile creare una directory [%s] per un bug report"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Solo superuser � abilitato ad installare pacchetti"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Per installare %s � richiesto uno dei seguenti pacchetti:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "E' richiesto uno dei seguenti pacchetti:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Qual'� la tua scelta? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Spiacente, scelta errata, prova di nuovo\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1154,31 +1309,31 @@ msgstr ""
"%s\n"
"va bene "
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "Impossibile installare il pacchetto %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget mancante\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s � in conflitto con %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1189,7 +1344,7 @@ msgstr ""
"%s\n"
"va bene?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1197,7 +1352,7 @@ msgid ""
msgstr ""
"Per soddisfare le dipendenze, saranno installati i seguenti pacchetti(%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1206,33 +1361,33 @@ msgstr ""
"Dovete essere root per installare le seguenti dipendenze:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "non riesco a recuperare pacchetto sorgente, interrompo"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
"Per favore inserisci il supporto denominato \"%s\" nel dispositivo [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Premi Enter quando sei pronto..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "I seguenti pacchetti hanno delle firme errate"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Vuoi proseguire con l'installazione?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1242,25 +1397,25 @@ msgstr ""
"installazione fallita, alcuni file sono mancanti.\n"
"Potresti voler aggiornare il tuo database di urpmi"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Installazione fallita"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "sto distribuendo %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Provo l'installazione senza controllare le dipendenze? (s/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Provo l'installazione ancora pi� forzata (--force)? (s/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "tutto gi� installato"
@@ -1281,11 +1436,6 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-" --synthesis - utilizza la synthesis specificata invece del db urpmi.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - elenca i pacchetti disponibili.\n"
@@ -1353,11 +1503,6 @@ msgstr " -g - stampa i gruppi anche col nome.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - stampa anche versione e release col nome.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-" -f - stampa versione, release e architettura con il nome.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
@@ -1550,13 +1695,6 @@ msgstr "non � stata trovata una lista completa dei media"
#~ msgid "problem reading hdlist file, trying again"
#~ msgstr "problema in lettura dell'hdlist file, riprovo"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - rimuovi i pacchetti se una versione migliore � gi� "
-#~ "installata.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr "il supporto \"%s\" cerca di usare una lista gi� usata, lo ignoro"
diff --git a/po/ja.po b/po/ja.po
index b64ea778..f95e9b79 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 1999-12-19 14:43+0100\n"
"Last-Translator: Taisuke Yamada <tai@imasy.or.jp>\n"
"Language-Team: Japanese\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=euc-jp\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "%s �򥤥󥹥ȡ������\n"
@@ -26,35 +26,35 @@ msgid ""
"You requested installation of package %s\n"
msgstr "���ꤵ�줿�ѥå�������%s�ˤ򥤥󥹥ȡ��뤷�Ƥ��ޤ���\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "��������Ǥ��礦����"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "�Ϥ���³�Ԥ����"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "����������ߤ����"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn�Σ��"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "Yy�٣��ϥ�"
# ��
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (�Ϥ�(Y)/������(n)) [�Ϥ�] "
@@ -609,7 +609,7 @@ msgid "Installation failed on node %s"
msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
@@ -636,8 +636,9 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr ""
@@ -700,6 +701,133 @@ msgstr "��¸�ط��Τ��ᡢ���Υѥå������⥤�󥹥ȡ��뤷�ޤ� (%d MB)"
msgid "Removing failed"
msgstr ""
+#: ../urpmf_.c:26
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+
+#: ../urpmf_.c:38
+msgid " --all - print all tags.\n"
+msgstr ""
+
+#: ../urpmf_.c:39
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+
+#: ../urpmf_.c:41
+msgid " --group - print tag group: group.\n"
+msgstr ""
+
+#: ../urpmf_.c:42
+msgid " --size - print tag size: size.\n"
+msgstr ""
+
+#: ../urpmf_.c:43
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr ""
+
+#: ../urpmf_.c:44
+msgid " --summary - print tag summary: summary.\n"
+msgstr ""
+
+#: ../urpmf_.c:45
+msgid " --description - print tag description: description.\n"
+msgstr ""
+
+#: ../urpmf_.c:46
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:47
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:48
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:49
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:50
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:51
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr ""
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+
+#: ../urpmf_.c:57
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:58
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -926,14 +1054,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1055,41 +1175,41 @@ msgstr ""
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
#, fuzzy
msgid "Only superuser is allowed to install packages"
msgstr ""
"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, fuzzy, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "���Υѥå������Τ����줫��ɬ�פǤ�:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "���Υѥå������Τ����줫��ɬ�פǤ�:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "�ɤ�����Ӥޤ�����(1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "ͭ��������ǤϤ���ޤ��󡣤⤦���٤��ꤤ���ޤ�\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1097,32 +1217,32 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr ""
"��������ѥå������Υ��󥹥ȡ���ϥ����ѡ��桼�����Ǥʤ��ƤϤǤ��ޤ���"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1132,50 +1252,50 @@ msgstr ""
"���åץ��졼�ɤΤ���ˤϤ����Ĥ��Υѥå�������������\n"
"ɬ�פ�����ޤ��ʤ����̤�����Ǥ���\n"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr "��¸�ط��Τ��ᡢ���Υѥå������⥤�󥹥ȡ��뤷�ޤ� (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "�������ѥå�����������Ǥ��ޤ���Ǥ��������Τޤ޽�λ���ޤ�"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "��ǥ�����%s�ˤ� %s ���������Ʋ�������"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "����ä���ϥ꥿���󥭡��򲡤��Ʋ�������"
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "%s �ϼ��Υѥå���������ˤ���ޤ�: %s\n"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
# ��
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
#, fuzzy
msgid " (y/N) "
msgstr " (�Ϥ�(Y)/������(n)) [�Ϥ�] "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1183,28 +1303,28 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "���󥹥ȡ���˼��Ԥ��ޤ���"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "%s �򥤥󥹥ȡ������\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr ""
"��¸�ط����ǧ�����˥��󥹥ȡ�����ߤޤ����� (�Ϥ�(y)/������(N)) [������] "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr ""
"���٥��󥹥ȡ�����ߤޤ�������--force �����Ǥ��� (�Ϥ�(y)/������(N)) [����"
"��] "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "���٤ƴ��˥��󥹥ȡ��뤵��Ƥ��ޤ�"
@@ -1219,10 +1339,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr ""
@@ -1276,10 +1392,6 @@ msgstr ""
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/ka.po b/po/ka.po
index c9c13145..ac31ab21 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2000-05-15 18:58+0200\n"
"Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
"Language-Team: Georgian\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "ვაინსტალირებ: %s\n"
@@ -25,34 +25,34 @@ msgid ""
"You requested installation of package %s\n"
msgstr ""
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "თანახმა ხართ?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "ო-ქეი"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "გამოქცევა"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "nNaAა"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "yYkKxXხ"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (ხ/ა) [ხ] "
@@ -614,7 +614,7 @@ msgid "Installation failed on node %s"
msgstr "ინსტალაცია ჩაიშალა"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "ინსტალაცია ჩაიშალა"
@@ -641,8 +641,9 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr ""
@@ -703,6 +704,133 @@ msgstr "დამოკიდებულებების შესასრ�
msgid "Removing failed"
msgstr ""
+#: ../urpmf_.c:26
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+
+#: ../urpmf_.c:38
+msgid " --all - print all tags.\n"
+msgstr ""
+
+#: ../urpmf_.c:39
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+
+#: ../urpmf_.c:41
+msgid " --group - print tag group: group.\n"
+msgstr ""
+
+#: ../urpmf_.c:42
+msgid " --size - print tag size: size.\n"
+msgstr ""
+
+#: ../urpmf_.c:43
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr ""
+
+#: ../urpmf_.c:44
+msgid " --summary - print tag summary: summary.\n"
+msgstr ""
+
+#: ../urpmf_.c:45
+msgid " --description - print tag description: description.\n"
+msgstr ""
+
+#: ../urpmf_.c:46
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:47
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:48
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:49
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:50
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:51
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr ""
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+
+#: ../urpmf_.c:57
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:58
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -895,14 +1023,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1022,42 +1142,42 @@ msgstr ""
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
#, fuzzy
msgid "Only superuser is allowed to install packages"
msgstr ""
"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
"ჩაწეროს პაკეტები."
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, fuzzy, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "თქვენი არჩევანი? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "ცუდი არჩევანია, კიდევ სცადეთ\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1065,33 +1185,33 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr ""
"მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
"ჩაწეროს პაკეტები."
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1099,49 +1219,49 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "გთხოვთ ჩადოთ: %s სახელით: %s"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "გთხოვთ დაგვიდასტუროთ Enter ღილაკზე დაჭერით..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "%s შედმეგ პაკეტებშია: %s\n"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
#, fuzzy
msgid " (y/N) "
msgstr " (ხ/ა) [ხ] "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1149,25 +1269,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "ინსტალაცია ჩაიშალა"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "ვაინსტალირებ: %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "გნებავთ ვცადე ჩაწერა დამოკიდებულებების შემოწმების გარეშე? (ხ/ა) [ა] "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "გნებავთ ვცადო ჩაწერა ძალით (--force)? (ხ/ა) [ა] "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "უკვე ყველაფერი ჩაწერილია"
@@ -1182,10 +1302,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr ""
@@ -1239,10 +1355,6 @@ msgstr ""
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 76c06dd8..074bb956 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2001-09-22 03:14+0900\n"
"Last-Translator: Jaegeum Choe <baedaron@hananet.net>\n"
"Language-Team: Korean <baedaron@hananet.net>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=euc-kr\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "%s ��ġ ��...\n"
@@ -27,34 +27,34 @@ msgstr ""
"��Ű�� �ڵ� ��ġ...\n"
"���� ��Ű�� %s�� ��ġ�� ��û�߽��ϴ�.\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "����ұ��?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Ȯ��"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "���"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "Yy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (Y/n) "
@@ -613,7 +613,7 @@ msgid "Installation failed on node %s"
msgstr "��ġ ����."
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "��ġ ����."
@@ -640,8 +640,9 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr ""
@@ -703,6 +704,133 @@ msgstr "�������� ������Ű�� ����, ���� ��Ű���鵵 ��ġ�� ���Դϴ�. (%d MB)"
msgid "Removing failed"
msgstr "[%s] ���� ��"
+#: ../urpmf_.c:26
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+
+#: ../urpmf_.c:38
+msgid " --all - print all tags.\n"
+msgstr ""
+
+#: ../urpmf_.c:39
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+
+#: ../urpmf_.c:41
+msgid " --group - print tag group: group.\n"
+msgstr ""
+
+#: ../urpmf_.c:42
+msgid " --size - print tag size: size.\n"
+msgstr ""
+
+#: ../urpmf_.c:43
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr ""
+
+#: ../urpmf_.c:44
+msgid " --summary - print tag summary: summary.\n"
+msgstr ""
+
+#: ../urpmf_.c:45
+msgid " --description - print tag description: description.\n"
+msgstr ""
+
+#: ../urpmf_.c:46
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:47
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:48
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:49
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:50
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:51
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr ""
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+
+#: ../urpmf_.c:57
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:58
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -929,14 +1057,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1056,40 +1176,40 @@ msgstr "urpmi: �� �� ���� �ɼ� ��-%s��, ��--help���ɼ����� ������ ������.\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
#, fuzzy
msgid "Only superuser is allowed to install packages"
msgstr "��Ʈ ����ڸ��� ���� ��Ű���� ��ġ�� �� �ֽ��ϴ�."
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "���� ��Ű���� �� �ϳ��� %s�� ��ġ�ϴµ� �ʿ��մϴ�:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "���� ��Ű���� �� �ϳ��� �ʿ��մϴ�:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "��� ���� �����Ͻðڽ��ϱ�? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "������ �߸��Ǿ����ϴ�. �ٽ� �õ��ϼ���.\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1097,31 +1217,31 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "��Ʈ ����ڸ��� ���� ��Ű���� ��ġ�� �� �ֽ��ϴ�."
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1131,49 +1251,49 @@ msgstr ""
"���׷��̵��ϱ� ���ؼ��� �Ϻ� ��Ű���� ���ŵǾ�� �մϴ�. �� ����� ���� ����"
"���� �ʽ��ϴ�.\n"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr "�������� ������Ű�� ����, ���� ��Ű���鵵 ��ġ�� ���Դϴ�. (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "�ҽ� ��Ű���� ���� �� �����ϴ�, �ߴ��մϴ�."
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "��ġ [%2$s]�� ��%1$s���̵� ��������."
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "�� �Ǿ����� ENTERŰ�� ��������..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "���� ��Ű������ %s�� ��� �ֽ��ϴ�: %s"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
#, fuzzy
msgid " (y/N) "
msgstr " (Y/n) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1181,25 +1301,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "��ġ ����."
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "%s ��ġ ��...\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "������ �˻���� ��ġ�մϱ�? (y/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "��ġ�� ���� �����մϱ�? (y/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "��� ���� �̹� ��ġ�Ǿ� �ֽ��ϴ�."
@@ -1214,10 +1334,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr ""
@@ -1271,10 +1387,6 @@ msgstr ""
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/lt.po b/po/lt.po
index dd2787de..d46af62a 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2001-03-04 15:40+0200\n"
"Last-Translator: Mykolas Norvai�as <Myka@centras.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-13\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "�diegiamas %s\n"
@@ -28,34 +28,34 @@ msgstr ""
"Automatinis paket� �diegimas...\n"
"J�s� u�klaust� paket� �diegimas %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Ar taip gerai?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Gerai"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Nutraukti"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "TtYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (T/n) "
@@ -605,7 +605,7 @@ msgid "Installation failed on node %s"
msgstr "�diegimas nepavyko"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "�diegimas nepavyko"
@@ -632,8 +632,9 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr ""
@@ -695,6 +696,133 @@ msgstr "Priklausomybi� patenkinimui, bus �diegti �ie paketai(%d Mb)"
msgid "Removing failed"
msgstr ""
+#: ../urpmf_.c:26
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+
+#: ../urpmf_.c:38
+msgid " --all - print all tags.\n"
+msgstr ""
+
+#: ../urpmf_.c:39
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+
+#: ../urpmf_.c:41
+msgid " --group - print tag group: group.\n"
+msgstr ""
+
+#: ../urpmf_.c:42
+msgid " --size - print tag size: size.\n"
+msgstr ""
+
+#: ../urpmf_.c:43
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr ""
+
+#: ../urpmf_.c:44
+msgid " --summary - print tag summary: summary.\n"
+msgstr ""
+
+#: ../urpmf_.c:45
+msgid " --description - print tag description: description.\n"
+msgstr ""
+
+#: ../urpmf_.c:46
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:47
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:48
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:49
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:50
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:51
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr ""
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+
+#: ../urpmf_.c:57
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:58
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -907,14 +1035,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1035,40 +1155,40 @@ msgstr ""
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
#, fuzzy
msgid "Only superuser is allowed to install packages"
msgstr "Tik root vartotojas gali �diegti vietinius paketus"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, fuzzy, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Vienas i� �i� paket� yra reikalingas."
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Vienas i� �i� paket� yra reikalingas."
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Koks J�s� pasirinkimas? (1-%d)"
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Atsipra�au, blogas pasirinkimas, pakartokit\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1076,31 +1196,31 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "Tik root vartotojas gali �diegti vietinius paketus"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1109,49 +1229,49 @@ msgid ""
msgstr ""
"kaikuriuos paketus reikia i�mesti prie� atnaujinant, tai dar nepalaikoma \n"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr "Priklausomybi� patenkinimui, bus �diegti �ie paketai(%d Mb)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "negaliu gauti pirmini� byl�, nutraukiu"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Pra�ome �ki�ti laikmen� pavadint� \"%s\", � �rengin� [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "Pra�ome spausti 'enter', kada bus baigta..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "�iuose paketuose yra %s: %s\n"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
#, fuzzy
msgid " (y/N) "
msgstr " (T/n) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1159,25 +1279,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "�diegimas nepavyko"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "�diegiamas %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Pabandyti �diegim� be priklausomybi� tikrinimo? (t/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Pabandyti �diegim� priverstinai (--force)? (t/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "viskas ir taip jau �diegta"
@@ -1192,10 +1312,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr ""
@@ -1249,10 +1365,6 @@ msgstr ""
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/lv.po b/po/lv.po
index 3251a3a5..11e940c3 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+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"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-13\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "tiek instal�ta %s\n"
@@ -29,34 +29,34 @@ msgstr ""
"Autom�tik� pakot�u uzst�d��ana...\n"
"J�s l�dz�t uzst�d�t pakotni %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Vai piekr�tat?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Labi"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Atcelt"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "jJYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (J/n) "
@@ -616,7 +616,7 @@ msgid "Installation failed on node %s"
msgstr "Instal��ana neizdev�s mezgl� %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "Instal��ana ir iesp�jama"
@@ -647,8 +647,9 @@ msgstr ""
"\n"
"pielietojums:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - izvad�t �o pal�dz�bas zi�ojumu.\n"
@@ -713,6 +714,161 @@ msgstr "Lai apmierin�tu atkar�bas, tiks no�emtas sekojo�as pakotnes (%d MB)"
msgid "Removing failed"
msgstr "...kop��ana neizdev�s"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq versija %s\n"
+"Autorties�bas (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"�� ir br�va programmat�ra, un var tikt izplat�ta saska�� ar GNU GPL "
+"noteikumiem.\n"
+"\n"
+"pielietojums:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - run�gais re��ms.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - nedruk�t iez�mes v�rdu (noklus�tais, ja iez�me nav dota"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - druk�t visas iez�mes."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - druk�t iez�mes v�rdu: rpm fila v�rds (pie�em, ja iez�me "
+"nav"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - druk�t iez�mi: grupa."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - druk�t iez�mi: izm�rs."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - druk�t iez�mi: izm�rs."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - druk�t iez�mi: kopsavilkums."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - druk�t iez�mui: apraksts."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides - druk�t iez�mi: nodro�ina (vair�kas rindi�as)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - druk�t iez�mi: nepiecie�amas (vair�kas rindi�as)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - druk�t iez�mi: faili (vair�kas rindi�as)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr " --conflicts - druk�t iez�mi: konflikti (vair�kas rindi�as)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr " --obsoletes - druk�t iez�mi: novecoju�as (vair�kas rindi�as)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - fors�t hdlist failu �ener��anu.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - izt�r�t ies�kumu ke�atmi�as direktoriju.\n"
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -f - fors�t hdlist failu �ener��anu.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -c - izt�r�t ies�kumu ke�atmi�as direktoriju.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -c - izt�r�t ies�kumu ke�atmi�as direktoriju.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -949,14 +1105,6 @@ msgstr ""
"\n"
"pielietojums:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1076,40 +1224,40 @@ msgstr "urpmi: nezin�ma opcija \"-%s\", p�rbaudiet pielietojumu ar --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Nevar�ju izveidot direktoriju [%s] k��du zi�ojumam"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
#, fuzzy
msgid "Only superuser is allowed to install packages"
msgstr "Tikai root dr�kst instal�t pakotnes"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Lai instak�tu %s, ir nepiecie�ama viena no sekojo��m pakotn�m:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Ir nepiecie�ama viena no sekojo��m pakotn�m:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "K�da ir j�su izv�le? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Atvainojiet, nepareiza izv�le. M��iniet v�lreiz\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1120,31 +1268,31 @@ msgstr ""
"%s\n"
"vai piekr�tat?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "nevaru instal�t pakotni %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget nav atrodams\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s konflik� ar %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1155,14 +1303,14 @@ msgstr ""
"%s\n"
"vai piekr�tat?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr "Lai apmierin�tu atkar�bas, tiks instal�tas sekojo�as pakotnes (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1171,32 +1319,32 @@ msgstr ""
"Jums j�b�t root, lai instal�tu sekojo�as atkar�bas:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "nevar dab�t koda pakotnes, p�rtraucu"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "L�dzu ielieciet datu nes�ju \"%s\" ier�c� [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Nospiediet Enter, kad gatavs..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Sekojo��m pakotn�m ir slikti paraksti"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "V�laties turpin�t instal��anu?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1204,25 +1352,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Instal��ana neizdev�s"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "izplatu %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Vai m��in�t instal�t bez atkar�bu p�rbaudes? (j/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Vai m��in�t instal�t v�l uzst�j�g�k (--force)? (j/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "viss jau ir instal�ts"
@@ -1243,10 +1391,6 @@ msgstr ""
"\n"
"pielietojums:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - izvad�t sarakstu ar pieejam�m pakotn�m.\n"
@@ -1304,10 +1448,6 @@ msgstr ""
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/ms.po b/po/ms.po
index b86551b3..9eb8b821 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-03-12 16:17+0800\n"
"Last-Translator: Yuzz <yuzz@emasonline.com>\n"
"Language-Team: Malaysia <yuzz@emasonline.com>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "instal %s\n"
@@ -28,34 +28,34 @@ msgstr ""
"Instalasi pakej automatik...\n"
"Anda telah meminta instalasi pakej %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Semua OK?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Ok"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Batal"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "NnTt"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "Yy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (Y/t) "
@@ -611,7 +611,7 @@ msgid "Installation failed on node %s"
msgstr "Instalasi gagal"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "Instalasi gagal"
@@ -644,8 +644,9 @@ msgstr ""
"\n"
"penggunaan:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - cetak mesej bantuan ini.\n"
@@ -711,6 +712,164 @@ msgstr "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
msgid "Removing failed"
msgstr "...gagal disalin"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq versi %s\n"
+"HakCipta (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ini adalah perisian percuma dan boleh disebar mengikut kesesuaian GNU GPL.\n"
+"\n"
+"penggunaan:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - guna hanya kemaskini media.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - pakai hanya media tersenarai dgn koma.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - mod verbos.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - jangan cetak nama tag (lalai jika tiada tag pada baris"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - cetak semua tag."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - cetak nama tag: rpm nama fail (jika tiada diberikan pada"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - cetak kumpulan tag: kumpulan."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - cetak ukuran tag: ukuran."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - cetak ukuran tag: ukuran."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - cetak ringkasan tag: ringkasan."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - cetak penjelasan tag: penjelasan."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides - cetak sediaan tag: semua sediaan (beberapa baris)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - cetak keperluan tag: semua keperluan (beberapa baris)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - cetak fail tag: semua fail (bbrp baris)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr " --conflicts - cetak konflik tag: semua konflik (beberapa baris)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - cetak kadaluarsa tag: semua kadaluarsa (bbrp baris)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - paksa buat fail hdlist.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - cetak versi, keluaran dan arch dgn nama.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - bersihkan direktori kache header.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - hapus pakej jika versi yg lebih baik telah diinstal.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - hapus pakej jika versi yg lebih baik telah diinstal.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - pilih semua yg sama dgn baris perintah.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - pilih semua yg sama dgn baris perintah.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -939,14 +1098,6 @@ msgstr ""
"\n"
"penggunaan:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - guna hanya kemaskini media.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - pakai hanya media tersenarai dgn koma.\n"
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1073,39 +1224,39 @@ msgstr "urpmi: pilihan \"-%s\" tidak dikenali, periksa penggunaan dgn --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "gagal olah dgn benar [%s] pada nilai \"%s\""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Hanya superuser yang boleh menginstal pakej"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Salah satu pakej berikut diperlukan utk instalasi %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Salah satu pakej berikut diperlukan:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Pilihan Anda? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Salah pilih, cuba lagi\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1113,31 +1264,31 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "Hanya superuser yang boleh menginstal pakej"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget hilang\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1146,7 +1297,7 @@ msgid ""
msgstr ""
"beberapa pakej harus dihapuskan agar ter-upgrade, ini belum disokong lagi\n"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1154,7 +1305,7 @@ msgid ""
msgstr ""
"Pakej berikut akan diinstal agar syarat kebergantungan dipenuhi (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1163,34 +1314,34 @@ msgstr ""
"Anda perlu menjadi root utk install kebergantungan berikutnya:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "tidak dapat mengambil pakej asal, batal"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Masukkan media \"%s\" ke peranti [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "Tekan [Enter] jika selesai.."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "Pakej berikut mengandungi %s: %s"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (y/T) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1200,25 +1351,25 @@ msgstr ""
"Instalasi gagal, beberapa file hilang.\n"
"Anda mungkin perlu mengemaskini database urpmi"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Instalasi gagal"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "instal %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Cuba instalasi tanpa periksa kebergantungan? (y/T) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Cuba instalasi lebih keras (--force)? (y/T) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "semua telah diinstal"
@@ -1238,10 +1389,6 @@ msgstr ""
"\n"
"penggunaan:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
#, fuzzy
msgid " --list - list available packages.\n"
@@ -1308,10 +1455,6 @@ msgstr " -g - juga cetak kumpulan dgn nama.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - juga cetak versi dan keluaran dgn nama.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - cetak versi, keluaran dan arch dgn nama.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " dicarikan nama atau fail rpm yg tertera pada baris perintah.\n"
@@ -1677,12 +1820,6 @@ msgstr "Senarai media lengkap tidak dijumpai"
#~ msgid "problem reading hdlist file, trying again"
#~ msgstr "sulit baca fail hdlist, cuba lagi..."
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - hapus pakej jika versi yg lebih baik telah diinstal.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr "media \"%s\" cuba memakai senarai yg telah dipakai, media diabaikan"
diff --git a/po/mt.po b/po/mt.po
index 2644cf25..c6f99d73 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi-mt\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-09-05 19:42CET\n"
"Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
"Language-Team: Maltese <mt@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0beta2\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "qed jiġi nstallat %s\n"
@@ -28,34 +28,34 @@ msgstr ""
"Installazzjoni awtomatika ta' pakketti...\n"
"Int tlabt l-installazzjoni tal-pakkett %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Tajjeb?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Ok"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Ikkanċella"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "LlNn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "IiYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (I/L)"
@@ -610,7 +610,7 @@ msgid "Installation failed on node %s"
msgstr "Installazzjoni falliet fuq nod %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "Installazzjoni possibbli"
@@ -642,8 +642,9 @@ msgstr ""
"\n"
"użu:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - uri dan il-messaġġ ta' għajnuna.\n"
@@ -708,6 +709,167 @@ msgstr ""
msgid "Removing failed"
msgstr "...ikkupjar falla"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq verżjoni %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
+"GPL.\n"
+"\n"
+"użu:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - uża s-sorsi ta' aġġornament biss.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - uża biss is-sorsi llistjati b'virgoli.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr " --synthesis - uża s-sinteżi mogħti minflok id-database urpmi.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - modalità b'ħafna dettalji (verbose).\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr " --quiet - turix l-isem (impliċitu jekk il-kmand ma fihx tag,"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - uri t-tags kollha."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - uri l-isem: isem tal-fajl rpm (impliċitu jekk ma tingħata"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - uri l-grupp."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - uri d-daqs."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - uri d-daqs."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - uri sommarju"
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - uri deskrizzjoni"
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - uri \"provides\" - kull ma jipprovdi (diversi linji)"
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - uri \"requires\": kull ma jeħtieġ (diversi linji)"
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - uri \"files\": il-files kollha (diversi linji)"
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - uri \"conflicts\": kull ma joħloq konflitt (diversi "
+"linji)"
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - ipprintja l-kontenut ta' \"obsoletes\" (diversi linji)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - ġiegħel il-fajls hdlist jiġu ġenerati.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+" -f - uri verżjoni, ħarġa u arkitettura flimkien ma' l-isem.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - naddaf id-direttorju tal-cache tal-headers.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - neħħi pakkett jekk diġà hemm verżjoni aħjar installata.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - neħħi pakkett jekk diġà hemm verżjoni aħjar installata.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -946,14 +1108,6 @@ msgstr ""
"\n"
"użu:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - uża s-sorsi ta' aġġornament biss.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - uża biss is-sorsi llistjati b'virgoli.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1096,39 +1250,39 @@ msgstr "urpmi: għażla \"-%s\" mhux magħrufa, iċċekkja l-użu b' --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Ma nistax noħloq id-direttorju [%s] għar-rapport tal-bug"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Is-\"superuser\" biss għandu l-awtorità jistalla pakketti"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Wieħed minn dawn il-pakketti meħtieġa biex tinstalla %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "X'tagħżel? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Għażla ħażina, jiddispjaċini. Erġa' pprova\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1139,31 +1293,31 @@ msgstr ""
"%s\n"
"Taċċetta?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "ma nistax ninstalla l-pakkett %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget m'hux installat\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s jikkonfliġġi ma' %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1174,7 +1328,7 @@ msgstr ""
"%s\n"
"Taċċetta?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1183,7 +1337,7 @@ msgstr ""
"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll (%"
"d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1192,32 +1346,32 @@ msgstr ""
"Trid tkun \"root\" biex tinstalla dawn id-dipendenzi:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "ma nistax inġib il-pakketti tas-sors, se noħroġ"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Jekk jogħġbok daħħal id-diska mmarkata \"%s\" fl-apparat [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Agħfas Enter meta tlesti..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Dawn il-pakketti fihom firem ħżiena"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Trid tkompli l-installazzjoni ?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (i/L) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1227,25 +1381,25 @@ msgstr ""
"L-installazzjoni falliet, xi fajls huma nieqsa.\n"
"Forsi trid taġġorna d-database urpmi"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "installazzjoni falliet"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "qed jiġi distribwit %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Trid tinstalla mingħajr ma niċċekkja d-dipendenzi? (i/L) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Trid tipprova b'iżjed qawwa (--force)? (i/L)"
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "kollox diġà installat"
@@ -1266,10 +1420,6 @@ msgstr ""
"\n"
"użu:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr " --synthesis - uża s-sinteżi mogħti minflok id-database urpmi.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - uri l-pakketti disponibbli kollha.\n"
@@ -1333,11 +1483,6 @@ msgstr " -g - uri l-gruppi flimkien ma' l-isem.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - uri verżjoni u ħarġa flimkien ma' l-isem.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-" -f - uri verżjoni, ħarġa u arkitettura flimkien ma' l-isem.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
@@ -1530,13 +1675,6 @@ msgstr "ma nstabet ebda lista sħiħa ta' sorsi"
#~ msgid "problem reading hdlist file, trying again"
#~ msgstr "problema waqt il-qari tal-fajl hdlist, erġa' pprova"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - neħħi pakkett jekk diġà hemm verżjoni aħjar "
-#~ "installata.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr "is-sors \"%s\" jipprova juża lista diġà użata, sors injorat"
diff --git a/po/nl.po b/po/nl.po
index 36afb80b..6ee2dc35 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-08-31 01:36+0100\n"
"Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
"Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "bezig met installeren van %s\n"
@@ -29,23 +29,23 @@ msgstr ""
"Automatische installatie van pakketten...\n"
"U vroeg de installatie van pakket %s aan\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Is dit goed?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Ok"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Annuleren"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
@@ -54,13 +54,13 @@ msgstr "Nn"
# can hit those keys in their keyboard to reply.
# please keep the 'Yy' for compatibility reasons
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "JjYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (J/n) "
@@ -624,7 +624,7 @@ msgid "Installation failed on node %s"
msgstr "Installatie mislukt op knooppunt %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "Installatie is mogelijk"
@@ -656,8 +656,9 @@ msgstr ""
"\n"
"gebruik:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - geeft deze helptekst.\n"
@@ -725,6 +726,171 @@ msgstr ""
msgid "Removing failed"
msgstr "...kopiëren is mislukt"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq versie %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
+"GNU GPL.\n"
+"\n"
+"gebruik:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - gebruik alleen vernieuwingsmedia.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - gebruik alleen de media gescheiden door komma's.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+" --synthesis - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - 'gebruik veel woorden' modus.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - geeft de tag-naam niet weer (standaard als er geen tag "
+"wordt meegegeven"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - geeft alle tags weer."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - geeft de tag-naam weer: rpm bestandsnaam (als er geen "
+"tag mee is gegeven"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - geeft de tag-groep weer: groep."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - geeft de tag-grootte weer: grootte."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - geeft de tag-grootte weer: grootte."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - geeft de tag samenvatting: samenvatting."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - geeft de tag omschrijving: omschrijving."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - geeft de tag levert: alle 'provides' (meerdere regels)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - geeft de tag vereisten: alle 'requires' (meerdere "
+"regels)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --files - geeft de tag bestanden: alle bestanden (meerdere regels)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - geeft de tag conflicten: alle conflicten (meerdere "
+"regels)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - geeft de tag \"verouderd\": alle 'obsoletes' (meerdere "
+"regels)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - forceer aanmaak van hdlist bestanden.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - geeft de versie, release and arch met naam.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - maak headers cache map leeg.\n"
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -f - forceer aanmaak van hdlist bestanden.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - selecteer alle resultaten van console.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - selecteer alle resultaten van console.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -969,14 +1135,6 @@ msgstr ""
"\n"
"gebruik:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - gebruik alleen vernieuwingsmedia.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - gebruik alleen de media gescheiden door komma's.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1119,39 +1277,39 @@ msgstr "urpmi: onbekende optie \"-%s\", bekijk voor gebruik --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "kon directory [%s] niet aanmaken voor bugrapport"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Alleen de superuser (root) kan pakketten installeren"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Eén van de volgende pakketten is benodigd om te installeren: %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Eén van de volgende pakketten is benodigd:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Wat is uw keuze? (1-%d)"
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Sorry, foutieve keuze, probeer een andere\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1162,31 +1320,31 @@ msgstr ""
"%s\n"
"Is dit goed?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "kon volgend pakket niet installeren: %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget is niet geïnstalleerd\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s conflicteert met %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1198,7 +1356,7 @@ msgstr ""
"%s\n"
"Is dit goed?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1207,7 +1365,7 @@ msgstr ""
"Om aan de afhankelijkheden te voldoen worden de volgende pakketten ook "
"geinstalleerd (% d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1216,32 +1374,32 @@ msgstr ""
"U moet root zijn om de volgende afhankelijkheden te installeren:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "kon bron pakketten niet ontvangen, bezig met afbreken"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Gelieve het medium genaamd \"%s\" in apparaat [%s] te plaatsen"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Druk op Enter wanneer u klaar bent..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "De volgende pakketten bevatten een onjuiste handtekening"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Wilt u doorgaan met de installatie ?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1251,26 +1409,26 @@ msgstr ""
"Installatie is mislukt, sommige bestanden missen.\n"
"Misschien moet u de urpmi database opwaarderen"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Installatie mislukt"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "bezig met distribueren van %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr ""
"Proberen te installeren zonder de afhankelijkheden te controleren? (j/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Installatie forceren (--force)? (j/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "alles is al geïnstalleerd"
@@ -1291,11 +1449,6 @@ msgstr ""
"\n"
"gebruik:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-" --synthesis - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - geeft alle beschikbare pakketten weer\n"
@@ -1362,10 +1515,6 @@ msgstr " -g - toont de groepen ook met namen.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - geeft de versie en release samen met de naam.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - geeft de versie, release and arch met naam.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/no.po b/po/no.po
index c9168cbd..ee7c07c5 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2001-09-23 13:59CET\n"
"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
"Language-Team: Norsk\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.8\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "installerer %s\n"
@@ -29,34 +29,34 @@ msgstr ""
"Automatisk installasjon av pakker...\n"
"Du ba om installasjon av pakke %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Er det ok?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Ok"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Avbryt"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "JjYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (J/n) "
@@ -613,7 +613,7 @@ msgid "Installation failed on node %s"
msgstr "Installasjon mislykket p� node %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "Installasjon er mulig"
@@ -644,8 +644,9 @@ msgstr ""
"\n"
"bruk:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - skriv ut denne hjelpemeldingen.\n"
@@ -711,6 +712,166 @@ msgstr ""
msgid "Removing failed"
msgstr "...kopiering mislykket"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq versjon %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Dette er fri programvare og kan redistribueres under vilk�rene til GNU GPL.\n"
+"\n"
+"bruk:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - bruk bare oppdateringsmedia.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - bruk bare mediet listet med komma.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr " --synthesis - use the synthesis given instead of urpmi db.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - verbose mode.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - do not print tag name (default if no tag given on command"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - print all tags."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - print tag name: rpm filename (assumed if no tag given on"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - print tag group: group."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - print tag size: size."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - print tag size: size."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - print tag summary: summary."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - print tag description: description."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides - print tag provides: all provides (multiple lines)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - print tag requires: all requires (multiple lines)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - print tag files: all files (multiple lines)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - tving generasjon av hdlist filer.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - skriv ut versjon, utgivelse og arch med navn.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - clean headers cache directory.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - fjerner pakke hvis en bedre versjon allerede "
+"erinstallert.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - fjerner pakke hvis en bedre versjon allerede "
+"erinstallert.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - velg alle treff p� kommandolinjen.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - velg alle treff p� kommandolinjen.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -945,14 +1106,6 @@ msgstr ""
"\n"
"bruk:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - bruk bare oppdateringsmedia.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - bruk bare mediet listet med komma.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1087,39 +1240,39 @@ msgstr "urpmq: ukjent valg \"-%s\", sjekk bruk med --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Kan ikke opprette katalog [%s] for feilrapport"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Bare superbruker har adgang til � installere pakker"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "En av f�lgende pakker beh�ves for � installere %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "En av f�lgende pakker beh�ves:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Hva er ditt valg? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Beklager, d�rlig valg, pr�v igjen\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1130,31 +1283,31 @@ msgstr ""
"%s\n"
"er du enig ?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "kunne ikke installere pakke %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget mangler\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s er i konflikt med %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1165,7 +1318,7 @@ msgstr ""
"%s\n"
"er du enig ?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1173,7 +1326,7 @@ msgid ""
msgstr ""
"F�lgende pakker vil bli installert for � tilfredstille avhengigheter (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1182,32 +1335,32 @@ msgstr ""
"Du m� v�re root for � installere f�lgende avhengigheter:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "kunne ikke f� tak i kildepakker, avslutter"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Vennligst sett inn mediumet kalt \"%s\" p� enhet [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Trykk enter n�r det er ferdig..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "F�lgende pakker har d�rlige signaturer"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "�nsker du � fortsette installasjonen ?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1217,25 +1370,25 @@ msgstr ""
"Installasjon mislykket, noen filer mangler.\n"
"Du �nsker antageligvis � oppdatere urpmi databasen din"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Installasjon mislykket"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "distribuerer %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Pr�ve � installere uten � sjekke avhengigheter? (j/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Pr�ve � installere enda hardere (--force)? (j/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "alt er allerede installert"
@@ -1255,10 +1408,6 @@ msgstr ""
"\n"
"bruk:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr " --synthesis - use the synthesis given instead of urpmi db.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - lister tilgjengelige pakker.\n"
@@ -1319,10 +1468,6 @@ msgstr " -g - skriv ut grupper ogs� med navn.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - skriv ut versjon og utgivelse ogs� med navn.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - skriv ut versjon, utgivelse og arch med navn.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " navn eller rpm filer gitt p� kommandolinjem er etterspurt.\n"
@@ -1837,13 +1982,6 @@ msgstr "ingen full medialiste ble funnet"
#~ msgid "keeping only files referenced in provides"
#~ msgstr "beholder bare provides filer"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - fjerner pakke hvis en bedre versjon allerede "
-#~ "erinstallert.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr "media \"%s\" pr�ver � bruke en allerede brukt liste, media ignorert"
diff --git a/po/pl.po b/po/pl.po
index 39134cc7..5808b941 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-12-20 21:37+0100\n"
"Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "instalowanie %s\n"
@@ -27,34 +27,34 @@ msgstr ""
"Automatyczna instalacja pakiet�w...\n"
"Zg�oszono polecenie instalacji pakietu %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "W porz�dku?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "OK"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Anuluj"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "TtYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (T/n) "
@@ -616,7 +616,7 @@ msgid "Installation failed on node %s"
msgstr "Dla w�z�a %s instalacja nie powiod�a si�"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "Instalacja jest mo�liwa"
@@ -648,8 +648,9 @@ msgstr ""
"\n"
"u�ycie:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - wy�wietla ten komunikat pomocy.\n"
@@ -710,6 +711,164 @@ msgstr ""
msgid "Removing failed"
msgstr "Usuwanie zako�czone niepowodzeniem"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq wersja %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"To jest otwarte oprogramowanie i mo�e by� rozpowszechniane na zasadach "
+"licencji GNU GPL.\n"
+"\n"
+"usage:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - u�ywa tylko no�nik�w aktualizacyjnych.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+" --media - u�ywa tylko podanych no�nik�w (rozdzielonych "
+"przecinkami).\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr " --synthesis - u�ywa pliku syntezy podanego zamiast bazy urpmi.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - tryb komunikatywny.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - bez wy�wietlania nazwy znacznika\n"
+"(domy�lny tryb je�li nie podano znacznika w wierszu"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - wy�wietla wszystkie znaczniki."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - wy�wietla znacznik name: nazwa pliku rpm (tak�e gdy"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - wy�wietla znacznik group: grupa."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - wy�wietla znacznik size: rozmiar."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - wy�wietla znacznik size: rozmiar."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - wy�wietla znacznik summary: zestawienie."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - wy�wietla znacznik description: opis."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides - wy�wietla zanacznik provides: (wszyst. pakiety)"
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - wy�wietla znacznik requires: wszystkie zale�no�ci."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - wy�wietla znacznik files: wszystkie pliki."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr " --conflicts - wy�wietla znacznik conflicts: wszystkie konflikty."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - wy�wietla znacznik obsoletes: wszystkie przestarza�e pak."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - wymusza generacj� plik�w hdlist.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - wy�wietla wersj�, wydanie oraz archiwum z nazw�.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - czy�ci katalog nag��wk�w pami�ci podr�cznej.\n"
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -f - wymusza generacj� plik�w hdlist.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - wybiera wszystkie pasuj�ce pakiety.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - wybiera wszystkie pasuj�ce pakiety.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -951,16 +1110,6 @@ msgstr ""
"\n"
"u�ycie:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - u�ywa tylko no�nik�w aktualizacyjnych.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-" --media - u�ywa tylko podanych no�nik�w (rozdzielonych "
-"przecinkami).\n"
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - u�ywa podanego pliku syntezy zamiast bazy urpmi.\n"
@@ -1091,7 +1240,8 @@ msgstr " -v - tryb komunikatywny.\n"
#: ../urpmi_.c:117
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_.c:190
#, c-format
@@ -1102,39 +1252,39 @@ msgstr "urpmi: nieznana opcja \"-%s\", sprawd� wywo�anie z opcj� --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr "Co mo�na zrobi� z binarnymi plikami rpm przy u�yciu --instal-src"
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "nie mo�na utworzy� katalogu [%s] dla raportu o b��dach"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr "u�ywaj�c okre�lonego �rodowiska na %s\n"
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Tylko administrator ma prawo instalowa� pakiety"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Jeden z poni�szych pakiet�w musi zosta� zainstalowany %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Wymagany jest jeden z nast�puj�cych pakiet�w:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Jaki jest Tw�j wyb�r? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Niestety, niepoprawny wyb�r, spr�buj ponownie\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1145,31 +1295,31 @@ msgstr ""
"%s\n"
"zgadzasz si� ?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, c-format
msgid "in order to install %s"
msgstr "w celu zainstalowania pakietu %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr "z powodu niesatysfakcjonuj�cego pakietu %s"
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr "z powodu brakuj�cego %s"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr "z powodu kolizji z pakietem %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr "niezg�oszony"
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1180,7 +1330,7 @@ msgstr ""
"%s\n"
"zgadzasz si� ?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1189,7 +1339,7 @@ msgstr ""
"Zostan� zainstalowane nast�puj�ce pakiety w celu spe�nienia zale�no�ci (%d "
"MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1198,32 +1348,32 @@ msgstr ""
"Aby zainstalowa� nast�puj�ce zale�no�ci nale�y zrobi� to z konta roota:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "nie mo�na pobra� pakiet�w �r�d�owych, zaniechanie"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "W�� no�nik o nazwie \"%s\" do nap�du [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Naci�nij enter je�li jeste� gotowy(-a)..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Nast�puj�ce pakiety zawieraj� niepoprawne podpisy"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Czy chcesz kontynuowa� instalacj� ?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1234,25 +1384,25 @@ msgstr ""
"%s\n"
"Mo�e zachodzi� potrzeba aktualizacji bazy danych urpmi"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Instalacja nie powiod�a si�"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "rozpowszechnianie %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Pr�bowa� instalowa� bez sprawdzania zale�no�ci? (t/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Czy chesz spr�bowa� wymusi� instalacj� (--force)? (t/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "wszystko zosta�o ju� zainstalowane"
@@ -1273,10 +1423,6 @@ msgstr ""
"\n"
"usage:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr " --synthesis - u�ywa pliku syntezy podanego zamiast bazy urpmi.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - wypisuje dost�pne pakiety.\n"
@@ -1337,10 +1483,6 @@ msgstr " -g - wy�wietla grupy wraz z ich nazwami.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - wy�wietla wersj� i wydanie wraz z nazw�.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - wy�wietla wersj�, wydanie oraz archiwum z nazw�.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " ��danie dotycz�ce nazw lub plik�w podanych w wierszu polece�.\n"
diff --git a/po/pt.po b/po/pt.po
index ad59709a..8be9d59f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi-pt\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-12-19 15:21+0100\n"
"Last-Translator: Jos� JORGE <jose.jorge@oreka.com>\n"
"Language-Team: Portugu�s\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "a instalar %s\n"
@@ -32,34 +32,34 @@ msgstr ""
"Instala��o autom�tica de pacotes...\n"
"Pediu a instala��o do pacote %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Est� bem assim?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Aceitar"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Cancelar"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "SsYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (S/n) "
@@ -623,7 +623,7 @@ msgid "Installation failed on node %s"
msgstr "A instala��o falhou no elemento %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "A instala��o � poss�vel"
@@ -654,8 +654,9 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - mostra esta mensagem de ajuda.\n"
@@ -718,6 +719,178 @@ msgstr ""
msgid "Removing failed"
msgstr "N�o consegui apagar"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq vers�o %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Este programa � livre e pode ser redistribu�do sob o termos da GPL GNU.\n"
+"\n"
+"uso:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - utiliza s� os m�dias de actualiza��o.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - utiliza s� os m�dias indicados com virgulas.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr " --synthesis - usa a s�ntese indicada no lugar do bdd urpmi.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - modo detalhado.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - n�o mostra o nome da marca (por omiss�o se nenhuma marca "
+"� dado no commando"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - mostra todas as marcas."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - mostra a marca do nome : nome do rpm (por omiss�o se "
+"nenhuma"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - mostra a marca do grupo : group."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - mostra a marca do tamanho : size."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - mostra a marca do tamanho : size."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - mostra a marca do resumo : summary."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - mostra a marca da descri��o : description."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - mostra a marca dos inclusos : all provides (v�rias "
+"linhas)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - mostra a marca das necessidades : all requires (v�rias "
+"linhas)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --files - mostra a marca dos ficheiros : all files (v�rias linhas)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - mostra a marca dos conflitos : all conflicts (v�rias "
+"linhas)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - mostra a marca dos obsoletos : all obsoletes (v�rias "
+"linhas)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - for�a a criar os ficheiros hdlist.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+" -f - mostra a vers�o, o numero e a arquitectura com o nome.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - limpa a pasta cache dos cabe�alhos.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - apaga o pacote se uma vers�o mais recente j� est� "
+"instalada.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - apaga o pacote se uma vers�o mais recente j� est� "
+"instalada.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+" -a - escolhe todos os pacotes que correspondem � express�o.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+" -a - escolhe todos os pacotes que correspondem � express�o.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -960,14 +1133,6 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - utiliza s� os m�dias de actualiza��o.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - utiliza s� os m�dias indicados com virgulas.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1112,39 +1277,39 @@ msgstr ""
"O que pode ser feito com pacotes de rpm bin�rios quando se utiliza --install-"
"src"
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Imposs�vel de criar a pasta [%s] para comunicar o erro"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr "utilizando o ambiente especifico em %s\n"
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Apenas o SuperUtilizador pode instalar pacotes"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Um dos seguintes pacotes � necess�rio para instalar %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Um dos seguintes pacotes � necess�rio:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Qual � a sua escolha? (1-%d)"
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Desculpe, op��o incorrecta, tente de novo\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1155,31 +1320,31 @@ msgstr ""
"%s\n"
"Aceita?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "n�o consigo instalar o pacote %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "falta wget\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s est� em conflito com %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1191,7 +1356,7 @@ msgstr ""
"%s\n"
"aceitas ?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1200,7 +1365,7 @@ msgstr ""
"Por forma a resolver as depend�ncias, ser�o instalados os seguintes pacotes "
"(%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1209,32 +1374,32 @@ msgstr ""
"Voc� precisa de ser root para instalar a depend�ncias seguintes : \n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "foi imposs�vel obter pacotes fonte, a abortar"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Por favor insira o suporte de media \"%s\" no dispositivo [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Prima 'Enter' quando pronto..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Os seguintes pacotes t�m assinaturas erradas"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Deseja continuar a instala��o ?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1245,25 +1410,25 @@ msgstr ""
"%s\n"
"Pode ser util de actualizar a sua base de dados urpmi."
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "A instala��o falhou"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "a distribuir %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Tentar instala��o sem verificar depend�ncias? (s/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Tentar instala��o ainda de forma mais insistente (--force)? (s/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "j� est� tudo instalado"
@@ -1283,10 +1448,6 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr " --synthesis - usa a s�ntese indicada no lugar do bdd urpmi.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - lista os pacotes disponiv�is.\n"
@@ -1346,11 +1507,6 @@ msgstr " -g - indica o grupo com o nome.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - mostra a vers�o e o numero com o nome.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-" -f - mostra a vers�o, o numero e a arquitectura com o nome.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
@@ -1554,13 +1710,6 @@ msgstr "n�o encontrei nenhuma lista de m�dia completa"
#~ msgid "problem reading hdlist file, trying again"
#~ msgstr "problema ao ler o ficheiro hdlist, vou tentar outra vez"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - apaga o pacote se uma vers�o mais recente j� est� "
-#~ "instalada.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr ""
#~ "o m�dia \"%s\" tenta utilizar uma lista j� utilizada, vai ser ignorado"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 76f26738..3721d6ab 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-12-14 03:10GMT\n"
"Last-Translator: Carlos Roberto Mafra <crmafra@mafra.eti.br>\n"
"Language-Team: Brazilian Portuguese <C@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.5\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "instalando %s\n"
@@ -30,34 +30,34 @@ msgstr ""
"Instala��o autom�tica de pacotes...\n"
"Voc� pediu a instala��o do pacote %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Tudo bem?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Ok"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Cancelar"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "SsYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (S/n) "
@@ -612,7 +612,7 @@ msgid "Installation failed on node %s"
msgstr "Instala��o falhou no n�dulo %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "Instala��o � poss�vel"
@@ -644,8 +644,9 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - imprime esta mensagem de ajuda.\n"
@@ -710,6 +711,173 @@ msgstr ""
msgid "Removing failed"
msgstr "A remo��o falhou"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq vers�o %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Este � um software livre, e pode ser redistribu�do sob os termos da GPL, "
+"GNU.\n"
+"\n"
+"uso:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - use somente m�dia update.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --m�dia - use somente a m�dia listada em aspas.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+" --synthesis - usa a s�ntese dada ao inv�s do banco de dados urpmi.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - modo verbose.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - n�o imprime nenhuma tag (defalut, se nenhuma tag dada no "
+"comando"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --tudo - imprime todas as tags."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - imprime o nome da tag: rpm nome-do-arquivo (suposto, se "
+"nenhuma tag no"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --grupo - imprime a tag grupo: grupo."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - imprime a tag tamanho: tamanho."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - imprime a tag tamanho: tamanho."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - imprime a tag sum�rio: sum�rio."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - imprime a tag descri��o: descri��o."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - imprime a tag fornece: tudo fornece (m�ltiplas linhas)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - imprime a tag necessita: tudo necessita "
+"(m�ltiplas linhas)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --arquivos - imprime a tag arquivos: tudo arquivos (m�ltiplas "
+"linhas)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflita - imprime a tag conflita: tudo conflita (m�ltiplas linhas)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletos - imprime a tag obsoletos: tudo obsoletos (m�ltiplas "
+"linhas)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - for�a a gera��o de arquivos hdlist.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - imprime vers�o, release e 'arch', com nome.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - limpa o diret�rio dos cabe�alhos de cache.\n"
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -f - for�a a gera��o de arquivos hdlist.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+" -a - seleciona todos os pacotes que combinam com a express�o.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+" -a - seleciona todos os pacotes que combinam com a express�o.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -955,14 +1123,6 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - use somente m�dia update.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --m�dia - use somente a m�dia listada em aspas.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1102,39 +1262,39 @@ msgstr "urpmi: op��o desconhecida \"-%s\", cheque o uso com --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr "O que pode ser feito com arquivos rpm bin�rios ao usar --install-src"
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "N�o foi poss�vel criar o diret�rio [%s] para relat�rio de falhas"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr "usando o ambiente espec�fico em %s\n"
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Apenas o super-usu�rio tem permiss�o para instalar pacotes"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Um dos seguintes pacotes s�o necess�rios para instalar %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Um dos pacotes a seguir � necess�rio:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Qual � a sua escolha? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Desculpe, m� escolha, tente novamente\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1145,31 +1305,31 @@ msgstr ""
"%s\n"
"Concorda ?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "N�o foi poss�vel instalar o pacote %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget est� faltando\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s conflita com %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1180,7 +1340,7 @@ msgstr ""
"%s\n"
"Concorda ?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1189,7 +1349,7 @@ msgstr ""
"Para satisfazer as depend�ncias, os seguintes pacotes ir�o ser instalados (%"
"d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1198,32 +1358,32 @@ msgstr ""
"Voc� precisa ser root para instalar as seguintes depend�ncias :\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "incapaz de obter a pacotes fonte, abortando"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Favor inserir a m�dia chamada \"%s\" no dispositivo [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Aperte enter quando estiver pronto..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Os seguintes pacotes cont�m assinaturas erradas"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Voc� deseja continuar com a instala��o ?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1234,25 +1394,25 @@ msgstr ""
"%s\n"
"Voc� deve atualizar a sua base de dados urpmi"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Instala��o falhou"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "distribuindo %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Tentar instalar sem checar as depend�ncias? (s/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Tentar instalar com ainda mais for�a (--force)? (s/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "tudo j� instalando"
@@ -1273,11 +1433,6 @@ msgstr ""
"\n"
"uso:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-" --synthesis - usa a s�ntese dada ao inv�s do banco de dados urpmi.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - lista os pacotes dispon�veis.\n"
@@ -1339,10 +1494,6 @@ msgstr " -g - imprime grupos, com nome tamb�m.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - imprime vers�o e release com nome tamb�m.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - imprime vers�o, release e 'arch', com nome.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr "Nomes ou arquivos rpm dados na linha de comando s�o consultados \n"
diff --git a/po/ro.po b/po/ro.po
index a36b7b5a..2a972f05 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-12-11 08:55+0200\n"
"Last-Translator: Harald Ersch <hersch@romatsa.ro>\n"
"Language-Team: Romanian <rtfs-project@sourceforge.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.6\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "instalez %s\n"
@@ -29,34 +29,34 @@ msgstr ""
"Instalare automat� a pachetelor...\n"
"A�i cerut instalarea pachetului %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Este OK?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "OK"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Renun��"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "DdYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (D/n) "
@@ -615,7 +615,7 @@ msgid "Installation failed on node %s"
msgstr "Instalarea a e�uat �n nodul %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "Instalarea este posibil�"
@@ -646,8 +646,9 @@ msgstr ""
"\n"
"Utilizare:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - afi�eaz� acest mesaj.\n"
@@ -713,6 +714,173 @@ msgstr ""
msgid "Removing failed"
msgstr "...copiere nereu�it�"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq versiunea %s\n"
+"Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"Acest program este soft liber �i poate fi redistribuit �n termenii GNU GPL.\n"
+"\n"
+"Utilizare:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - folose�te numai mediile de actualizare.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - folose�te numai mediile listate cu virgul�.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+" --synthesis - folose�te fi�ierul synthesis dat �n loc de urpmi db.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - mod detaliat.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - nu afi�eaz� eticheta Nume (implicit dac� nu s-a dat "
+"eticheta �n linia de"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - afi�eaz� toate etichetele"
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - afi�are etichet� Nume: rpm numefi�ier (implicit dac� "
+"eticheta nu"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - afi�are etichet� Grup: grup."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - afi�are etichet� M�rime: m�rime."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - afi�are etichet� M�rime: m�rime."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - afi�are etichet� Sumar: sumar."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - afi�are etichet� Descriere: descriere."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - afi�eaz� eticheta Ofer�: tot ce ofer� (linii multiple)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - afi�eaz� eticheta Necesit�: necesit��ile (linii "
+"multiple)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --files - afi�eaz� eticheta Fi�iere: toate fi�ierele (linii "
+"multiple)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - afi�eaz� eticheta Conflicte: toate conflictele (linii "
+"multiple)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - afi�eaz� eticheta Perimat: toate perimatele (linii "
+"multiple)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - for�eaz� generarea fi�ierelor hdlist.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - afi�eaz� versiune, edi�ie �i arhitectur� cu nume.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - cur��� directorul cache antete.\n"
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -f - for�eaz� generarea fi�ierelor hdlist.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+" -a - selecteaz� toate pachetele ce se potrivesc cu expresia.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+" -a - selecteaz� toate pachetele ce se potrivesc cu expresia.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -965,14 +1133,6 @@ msgstr ""
"\n"
"Utilizare:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - folose�te numai mediile de actualizare.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - folose�te numai mediile listate cu virgul�.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1116,39 +1276,39 @@ msgstr "urpmi: op�iune necunoscut� \"-%s\", verifica�i folosirea cu --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Nu pot creea directorul [%s] pentru raportul de erori"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Doar superutilizatorul poate instala pachete"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Unul din urm�toarele pachete e necesar pt. instalarea %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Unul din urm�toarele pachete e necesar:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ce alege�i? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "A�i ales gre�it, �ncerca�i din nou\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1159,31 +1319,31 @@ msgstr ""
"%s\n"
"Sunte�i de acord?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "nu pot instala pachetul %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget lipse�te\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s e �n conflict cu %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1194,7 +1354,7 @@ msgstr ""
"%s\n"
"Sunte�i de acord?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1203,7 +1363,7 @@ msgstr ""
"Pentru a satisface dependen�ele, urm�toarele pachete vor fi instalate (% d "
"MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1213,32 +1373,32 @@ msgstr ""
"dependente:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "Nu pot prelua pachetele surs�, �ntrerup"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "V� rog s� introduce�i mediul numit \"%s\" �n dispozitivul [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Ap�sa�i Enter c�nd e gata..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Urm�toarele pachete au semn�turi gre�ite"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Dori�i s� continua�i instalarea?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (D/n) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1249,25 +1409,25 @@ msgstr ""
"%s\n"
"Probabil ar trebui s� actualiza�i baza de date urpmi."
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Instalarea a e�uat"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "distribui %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "S� �ncerc instalarea f�r� verificarea dependen�elor? (d/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "�ncearc� instalarea �nc� �i mai dur (--force)? (d/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "totul este deja instalat"
@@ -1287,11 +1447,6 @@ msgstr ""
"\n"
"Utilizare:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-" --synthesis - folose�te fi�ierul synthesis dat �n loc de urpmi db.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - listeaz� pachetele disponibile.\n"
@@ -1356,10 +1511,6 @@ msgstr " -g - arat� grupurile �i cu nume.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - afi�eaz� versiunea �i edi�ia cu nume.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - afi�eaz� versiune, edi�ie �i arhitectur� cu nume.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " numele sau fi�ierele rpm date �n linia de comand� sunt interogate.\n"
diff --git a/po/ru.po b/po/ru.po
index b20feb0a..190efde4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2000-08-01 16:24+0200\n"
"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
"Language-Team: Russian\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "��������������� %s\n"
@@ -30,34 +30,34 @@ msgstr ""
"�������������� ��������� �������...\n"
"�� ��������� ��������� ������ %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "��� ���������?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Ok"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "������"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "��Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "��Yy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (�/�) "
@@ -620,7 +620,7 @@ msgid "Installation failed on node %s"
msgstr "��������� �� ���� %s �� �����������."
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "��������� ��������."
@@ -652,8 +652,9 @@ msgstr ""
"\n"
"�������������:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - ������� ��� ���������.\n"
@@ -713,6 +714,176 @@ msgstr "��� �������������� ������������ ��������� ������ ����� ������� (%d ��)"
msgid "Removing failed"
msgstr "�������� ����������� ��������"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\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, 2001, 2002 MandrakeSoft.\n"
+"��� �������� ����������� ����������� � ��� ����� ���������������� ��� "
+"���������� ������� GNU GPL.\n"
+"\n"
+"�������������:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - ������������ ������ ���������� ��� ����������.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+" --media - ������������ ������ ����������, ����������� ��������.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr " --synthesis - ������������ ������-���� ������ �� urpmi.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - ��������� �����.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - �� �������� ��� name (�� ���������, ���� ��� �� ����� � "
+"���������"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - �������� ��� ����."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - �������� ��� name: ��� ����� rpm (��������, ���� ��� �� "
+"�����"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - �������� ��� group: ������."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - �������� ��� size: ������."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - �������� ��� size: ������."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - �������� ��� summary: ����� ��������."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - �������� ��� description: ��������."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - �������� ��� provides: ��� ������������ ����� "
+"(������������� �����)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - �������� ��� requires: ��� ����������� �����"
+"(������������� �����)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --files - �������� ��� files: ��� ����� (������������� �����)"
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - �������� ��� conflicts: ��� ������������� �����"
+"(������������� �����)"
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - �������� ��� obsoletes: ��� ���������� �����"
+"(������������� �����)"
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - ������������� ������� ����� hdlist.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+" -f - ������� ������, ����� ������ � ������ � ���������.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - �������� ���������� ���� ����������.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - ������� �����, ���� ��� ����������� ����� ����� ������.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - ������� �����, ���� ��� ����������� ����� ����� ������.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - ������� ��� ������, ��������������� ����������.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - ������� ��� ������, ��������������� ����������.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -963,15 +1134,6 @@ msgstr ""
"\n"
"�������������:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - ������������ ������ ���������� ��� ����������.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-" --media - ������������ ������ ����������, ����������� ��������.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1118,39 +1280,39 @@ msgstr "urpmi: ����������� ����� \"-%s\", ��������� ������������� � --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr "��� ������ � ��������� ������� rpm ��� ������������� --install-src"
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "���������� ������� ���������� [%s] ��� ������ �� ������"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr "������������ ������ �������� �� %s\n"
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "������ ����������������� ����������� ������������� ������"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "���������� ���������� ���� �� ��������� ������� %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "����� ���� �� ��������� �������:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "��� �����? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "��������, ��������� �����, ���������� ���\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1161,31 +1323,31 @@ msgstr ""
"%s\n"
"�� ��������?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "���������� ���������� ����� %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget �����������\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s ����������� � %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1196,7 +1358,7 @@ msgstr ""
"%s\n"
"�� ��������?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1204,7 +1366,7 @@ msgid ""
msgstr ""
"��� �������������� ������������ ����� ����������� ��������� ������ (%d ��)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1213,32 +1375,32 @@ msgstr ""
"��� ���������� ����� ����� root'�, ����� ���������� ��������� �����������:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "���������� �������� �������� ������, ��������� ����������"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "����������, �������� ���������� � ������ \"%s\" � ���������� [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "������� Enter, ����� ������ ������..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "��������� ������ ����� �������� �������"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "������� ���������� ���������?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (�/�) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1249,25 +1411,25 @@ msgstr ""
"%s\n"
"��� ����� ������������� �������� ���� ���� ������ urpmi"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "��������� �� ���������."
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "�������������� %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "����������� ��������� ��� �������� ������������? (�/�) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "����������� ���������� ��� ����� ���������� (--force)? (�/�) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "��� ��� �����������"
@@ -1288,10 +1450,6 @@ msgstr ""
"\n"
"�������������:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr " --synthesis - ������������ ������-���� ������ �� urpmi.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - ������� ������ ��������� �������.\n"
@@ -1352,11 +1510,6 @@ msgstr " -g - ������� ������ ������ � ����������.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - ������� ������ � ����� ������ ������ � ���������.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-" -f - ������� ������, ����� ������ � ������ � ���������.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
@@ -1604,13 +1757,6 @@ msgstr "��� ������ �������� ������ �����������"
#~ msgid "problem reading hdlist file, trying again"
#~ msgstr "�������� ��� ������ ����� hdlist, ��������� �������"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - ������� �����, ���� ��� ����������� ����� ����� "
-#~ "������.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr ""
#~ "���������� \"%s\" �������� ������������ ��� ������������ list, ���������� "
diff --git a/po/sk.po b/po/sk.po
index 47bba5dc..2a29d1d3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2003-01-16 18:49+0100\n"
"Last-Translator: Pavol Cvengros <orpheus@hq.alert.sk>\n"
"Language-Team: sk <i18n@hq.alert.sk>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "in�talujem %s\n"
@@ -30,34 +30,34 @@ msgstr ""
"Automatick� in�tal�cia bal��kov...\n"
"�iadali ste in�tal�ciu bal��ka %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Je to v poriadku?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Ok"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Zru�"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "Yy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (Y/n) "
@@ -613,7 +613,7 @@ msgid "Installation failed on node %s"
msgstr "In�tal�cia zlyhala na uzle %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "In�tal�cia je mo�n�"
@@ -644,8 +644,9 @@ msgstr ""
"\n"
"pou�itie:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - vyp�sa� t�to pomoc.\n"
@@ -706,6 +707,163 @@ msgstr ""
msgid "Removing failed"
msgstr "Odstr�nenie nebolo �spe�n�"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq verzia %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Toto je free softv�r a mus� by� redistribuovan� pod licenciou GNU GPL.\n"
+"\n"
+"pou�itie:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - pou�i� iba aktualiza�n� m�dia.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - pou�i� len zadan� m�dia.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr " --synthesis - pou�i� zadan� synthesis namiesto urpmi db.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - vypisova�.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - nevypisuj meno tagu (�tandardne ak nie je zadan� tag v "
+"pr�kazovom"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - vyp�sa� v�etky tagy."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - vyp�sa� meno tagu: rpm s�bor (potrebn� ak nie je zadan� "
+"tag"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - vyp�sa� skupinu tagu: skupina."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - vyp�sa� ve�kos� tagu: ve�kos�."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - vyp�sa� ve�kos� tagu: ve�kos�."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - vyp�sa� sum�r tagu: sum�r."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - vyp�sa� popis tagu: popis."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - vyp�sa� �o tag poskytuje : �o poskytuje (viac riadkov)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - vyp�sa� �o tag potrebuje: �o potrebuje (viac riadkov)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - vyp�sa� s�bory tagu: v�etky s�bory (viac riadkov)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr " --conflicts - vyp�sa� konflikty tagu: konflikty (viac riadkov)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr " --obsoletes - vyp�sa� �o nahradzuje: nahradzuje (viac riadkov)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - vn�� generovanie hdlist s�borov.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - vyp�sa� verziu, release a architekt�ru k menu.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - zmaza� hlavi�ky v adres�ri do�asnej pam�te.\n"
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -f - vn�� generovanie hdlist s�borov.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - vyber v�etky bal��ky zodpovedaj�ce v�razu.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - vyber v�etky bal��ky zodpovedaj�ce v�razu.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -947,14 +1105,6 @@ msgstr ""
"\n"
"pou�itie:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - pou�i� iba aktualiza�n� m�dia.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - pou�i� len zadan� m�dia.\n"
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - pou�i� zadan� synthesis namiesto urpmi db.\n"
@@ -1092,39 +1242,39 @@ msgstr "urpmi: nezn�ma vo�ba \"-%s\", pou�itie zist�te s --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr "�o m��e by� vykonan� s bin�rnymi rpm s�bormy pri pou�it� --install-src"
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Nem��em vytvori� adres�r [%s] pre ohl�senie chyby"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr "pou�itie �pecifick�ho prostredia na %s\n"
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "In�talova� bal�ky m� dovolen� len superu��vate�"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Jeden z nasleduj�cich bal�kov je potrebn� nain�talova� %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Jeden z nasleduj�cich bal�kov je potrebn�:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "V� v�ber? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Prep��te, zl� vo�ba, sk�ste znova\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1135,31 +1285,31 @@ msgstr ""
"%s\n"
"s�hlas�te ?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, c-format
msgid "in order to install %s"
msgstr "pre in�tal�ciu bal��ka %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr "kv�li neuspokojen�mu %s"
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr "kv�li ch�bajucemu %s"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr "kv�li konfliktom s %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr "nepo�adovan�"
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1170,7 +1320,7 @@ msgstr ""
"%s\n"
"s�hlas�te ?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1179,7 +1329,7 @@ msgstr ""
"Kv�li zachovaniu z�vislost�, by mali by� nain�talovan� nasleduj�ce bal�ky (%"
"d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1188,34 +1338,34 @@ msgstr ""
"Mus�te by� root ak chcete nain�talova� tieto aktualiz�cie:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "nem��em z�ska� zdrojov� bal��ky, preru�ujem"
# **************fix me****************
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Pros�m vlo�te m�dium \"%s\" do zariadenia [%s]"
# ******************fix me***********
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Stla�te Enter..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Nasleduj�ce bal��ky obsahuj� zle signat�ry"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Chcete pokra�ova� v in�tal�cii ?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (�/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1226,25 +1376,25 @@ msgstr ""
"%s\n"
"Mo�no budete chcie� aktualizova� Va�u urpmi datab�zu"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "In�tal�cia zlyhala"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "distrib�cia %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Sk�si� in�tal�ciu bez kontroly z�vislost�? (�/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Sk�si� \"tvrd�iu\" in�tal�ciu (--force)? (�/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "v�etko je u� nain�talovan�"
@@ -1264,10 +1414,6 @@ msgstr ""
"\n"
"pou�itie:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr " --synthesis - pou�i� zadan� synthesis namiesto urpmi db.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - vyp�sa� v�etky bal��ky.\n"
@@ -1325,10 +1471,6 @@ msgstr " -g - vyp�sa� skupiny aj s menami.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - vyp�sa� verziu a release s menom.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - vyp�sa� verziu, release a architekt�ru k menu.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " men� alebo rpm s�bory zadan� v pr�kazovom riadku s� dotazovan�.\n"
diff --git a/po/sp.po b/po/sp.po
index 3334cd0a..f2b831e9 100644
--- a/po/sp.po
+++ b/po/sp.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-08-18 11:35GMT+1\n"
"Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
"Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.5\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "���������� %s\n"
@@ -30,34 +30,34 @@ msgstr ""
"���������� ���������j� �����a...\n"
"��������� ��� ���������j� ������ %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "�� �� �� �K ?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "�K"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "�������"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "��Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "��DdYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (�/�) "
@@ -619,7 +619,7 @@ msgid "Installation failed on node %s"
msgstr "����������� ��������"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "����������� ��������"
@@ -650,8 +650,9 @@ msgstr ""
"��� �� ��������� ������� � ���� ���� �������� �������������� ��� �������� \n"
"GNU � GPL. ��������:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - ��������� ���� ����� � ������.\n"
@@ -715,6 +716,165 @@ msgstr "���� ���������� ����������, ������� ������ �� ���� �������� (%d MB)"
msgid "Removing failed"
msgstr "...�������� ��������"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\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, 2001, 2002 MandrakeSoft.\n"
+"��� �� ��������� ������� � ���� ���� �������������� ��� �������� GNU GPL.\n"
+"\n"
+"��������:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - ������� ���� update �����.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - ������� ���� ������ ��������� �� �������.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - verbose ���.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - �� ������ ��� ����(default ������ ������� ���� ��� ��� � "
+"�������"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - ������ ��� ������."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - ������ ��� ����: rpm ��� �������� (�������������� "
+"������� ���� ����"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - ������ ��� �����: �����."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - ������ ��� ��������: ��������."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - ������ ��� ��������: ��������."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - ������ ��� �������: �������."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - ������ ��� �����: ����."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides - ������ ��� ������: ��� ������ (����� ������)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - ������ ��� �������: ��� ������� (����� ������)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - ������ ��� ��������: ��� �������� (����� ������)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr " --conflicts - ������ ��� ��������: ��� �������� (����� ������)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - ��������� �� ���������� hdlist �������.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - ��������� �������, ������ � arch �� ������.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - ����� headers cache ������������.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - ������ ������ ������� �� ������ ������� ��� �����������.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - ������ ������ ������� �� ������ ������� ��� �����������.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - ��������� ��� ��������� � ��������� ������.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - ��������� ��� ��������� � ��������� ������.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -951,14 +1111,6 @@ msgstr ""
"��� �� ��������� ������� � ���� ���� �������� �������������� ��� �������� \n"
"GNU � GPL. ��������:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - ������� ���� update �����.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - ������� ���� ������ ��������� �� �������.\n"
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1100,39 +1252,39 @@ msgstr "urpmi: ��������� ����j� \"-%s\", ��������� �������� �� --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "�� ���� �� ������� ������������ [%s] �� ������������ �������"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "���� ������������� ���� ����������� �����e"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "����� �� �������� ������ �� �������� �� �� ����������� %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "�������� �� ������� �����(�):"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "��� �� ��� ����� ? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "��� �����, �������� ������\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1143,31 +1295,31 @@ msgstr ""
"%s\n"
"�� �� �� ������� ?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "�� ���� �� ���������� ����� %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "��������� wget\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s �� � ��������� �� %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1178,14 +1330,14 @@ msgstr ""
"%s\n"
"�� �� �� ������� ?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr "���� ���������� ����������, ������� ������ �� ���� ����������� (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1194,32 +1346,32 @@ msgstr ""
"������ �� ����� root ��������� �� �� ����������� ������� ������:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "����� ������ ��j� ��������,�������..."
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "������� ����j �� ������ %s � ������ %s"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "���������� enter ���� ������ �������..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "������� ������ ����� ���������� �������"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "�� �� ������ �� ��������� ������������� ?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (�/�) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1229,25 +1381,25 @@ msgstr ""
"����������� ��������, ��������� ���� �������.\n"
"����� ������ �� ��������� ���� urpmi ���� ��������"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "����������� ��������"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "���������� %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "������������ ��� ������� ���������� (�a/�e)? "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "�������� ����������� (--force)? (�a/�e) ?"
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "��� �� ��� �����������"
@@ -1267,10 +1419,6 @@ msgstr ""
"\n"
"��������:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - ��������� ����� ������.\n"
@@ -1334,10 +1482,6 @@ msgstr " -g - ��������� ����� �� ������.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - ��������� ������� �� ������ ��������.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - ��������� �������, ������ � arch �� ������.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " ����� ��� rpm ������� ���� � ��������� ������ �� �������.\n"
@@ -1698,13 +1842,6 @@ msgstr "���� ��������� ����� ����� ������"
#~ msgid "problem reading hdlist file, trying again"
#~ msgstr "������ ��� ��������� hdlist �����, ��������� ������"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - ������ ������ ������� �� ������ ������� ��� "
-#~ "�����������.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr ""
#~ "����� \"%s\" �������� �� ������� ����� ���� �� � ��������, ����� �� "
diff --git a/po/sq.po b/po/sq.po
index a19fd19e..6cc6dbd0 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "instalim i %s\n"
@@ -28,34 +28,34 @@ msgstr ""
"Instalim automatik� i pakove...\n"
"Ju keni k�rkuar instalimin e pakove %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "�sht� kjo n� rregull?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Ok"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Anulo"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "Yy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (P/j) "
@@ -618,7 +618,7 @@ msgid "Installation failed on node %s"
msgstr "Instalimi d�shtoj n� nyj�n %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "Instalimi �sht� i mundur"
@@ -649,8 +649,9 @@ msgstr ""
"\n"
"p�rdorim:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - shtype k�t� lajm� ndihmues.\n"
@@ -710,6 +711,174 @@ msgstr "P�r ta plot�suar mvar�sin, pakot� me radh� do t� zhduken (%d MB)"
msgid "Removing failed"
msgstr "Zhdukja d�shtoj"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq versioni %s\n"
+"Drejt� ae Autorit (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ky �sht� software gratis i cili mund t� shp�rndahet nd�r termet e GNU GPL.\n"
+"\n"
+"p�rdorues:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - p�rdori vet�m burimet e azhurnimit.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - p�rdori vet�m burimet e ndara me presje.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+" --synthesis - p�rdori skedaret e th�na sintez� n� vend t� baz�s s� t� "
+"dh�nave urpmi.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - model oratori.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - mos �faq� emrat e etiketave (marr�veshje n�se asnj� "
+"etiket� s'�sht� dh�n�"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - �faqi t� gjitha etiketat."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - �faqe etiket�n name: rpm skedarja (me marr�veshje n�se "
+"asnj� etiket� nuk �sht� dh�n�"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - �faqe etiket�n group: grupi."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - �faqe etiket�n size: madh�sia."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - �faqe etiket�n size: madh�sia."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --sumary - �faqe etiket�n summary: p�rmbledhje."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - �faqe etiket�n description: p�rshkrim."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - �faqi etiket� provides: t� gjitha pajisjet (linja t� "
+"shum�fishta)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - �faqe etiket�n requires: t� gjitha d�shirat� (linja t� "
+"shum�fishta)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --files - �faqr etiket�n files: t� gjitha skedaret (linja t� "
+"shum�fishta)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - �faqr etiket�n conflicts: t� gjitha konfliktet (linja t� "
+"shum�fishta)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - �faqr etiketn obsoletes: t� gjitha absolutisht (linja t� "
+"shum�fishta)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - forco p�rfitimin e skedareve hdlist.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+" -f - �faqe versionin, holl�sit� dhe arkitektures me em�r.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - pastrim i majave n� repertor� t� fsheht.\n"
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -f - forco p�rfitimin e skedareve hdlist.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - zgjedhni t� gjitha pakot me p�rshkrim t� nj�jt�.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - zgjedhni t� gjitha pakot me p�rshkrim t� nj�jt�.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -955,14 +1124,6 @@ msgstr ""
"\n"
"p�rdorim:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - p�rdori vet�m burimet e azhurnimit.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - p�rdori vet�m burimet e ndara me presje.\n"
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - p�rdori skedaret e dh�na sintez� n� vend t� db.\n"
@@ -1099,39 +1260,39 @@ msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
"�far� mund t� b�het me skedaret rpm binare n�se e p�rdorni --install-src"
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "I pa mundur krijimi i repertorit [%s] p�r raport t� bug(it)"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr "p�rdorim specifik i mjedisit n� %s\n"
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Vet�m administratori i sistemin (root) ka mund�si t� instaloj� pakot"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Nj� nga pakot me radh� duhet t� instalohet %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Nj� nga pakot me radh� nevojitet:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Cila �sht� zgidhja e juaj? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Kemi ndjes�, zgjedhje e gabuar, provoni edhe nj� her�\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1142,31 +1303,31 @@ msgstr ""
"%s\n"
"a pajtoheni me k�t� ?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, c-format
msgid "in order to install %s"
msgstr "n� urdh�r p�r instlaim %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr "ka arritur gjat� mosmarr�vshjes %s"
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr "ka arritur nga mungesa %s"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr "ka arritur gjat� konfliktit me %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr "i pa k�rkuar"
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1177,7 +1338,7 @@ msgstr ""
"%s\n"
"a pajtoheni me k�t� ?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1185,7 +1346,7 @@ msgid ""
msgstr ""
"P�r ti p�rmbushur mvar�sit, pakot e radhitura duhet t� instalohen (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1194,32 +1355,32 @@ msgstr ""
"Ju duhet t� jeni root q� t� instaloni pakot e radhitura:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "e pa mundur marrja e burimit t� pakos, d�shtim"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Ju lutemi futni burimin e emruar \"%s\" n� mjetin [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Shtypni Enter kur jeni i gatsh�m..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Pakot a radhitura kan� n�nshkrim t� pa pranuesh�m"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "A d�shironi t� vazhdoni me instalimin e tyre ?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (p/J)"
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1230,25 +1391,25 @@ msgstr ""
"%s\n"
"A d�shironi t� azhurnoni baz�n e t� dh�nave urpmi"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "D�shtim i instalimit"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "shp�rndaj� %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Tento instalimin pas verifikimin e mvar�sive? (p/J) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Tento ta forcosh instalimin (--force)? (p/J) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "gjdo gj� �sht� instaluar"
@@ -1268,12 +1429,6 @@ msgstr ""
"\n"
"p�rdorues:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-" --synthesis - p�rdori skedaret e th�na sintez� n� vend t� baz�s s� t� "
-"dh�nave urpmi.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - shpalosi pakot� lira.\n"
@@ -1336,11 +1491,6 @@ msgstr " -g - �faqi grupet njashtu dhe emrat.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - �faqe versionin me holl�si njashtu dhe emrin.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-" -f - �faqe versionin, holl�sit� dhe arkitektures me em�r.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/sr.po b/po/sr.po
index b7272550..e161a2a4 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-08-18 11:35GMT+1\n"
"Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
"Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.5\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "Instaliram %s\n"
@@ -30,34 +30,34 @@ msgstr ""
"Automatska instalacija paketa...\n"
"Zahtevali ste instalaciju paketa %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Da li je OK ?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "OK"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Poni�ti"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "NnNn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "DdDdYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (D/n) "
@@ -619,7 +619,7 @@ msgid "Installation failed on node %s"
msgstr "Instalaci�a neuspela"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "Instalaci�a neuspela"
@@ -650,8 +650,9 @@ msgstr ""
"Ovo je besplatan softver i mo�e biti slobodno redistribuiran pod uslovima \n"
"GNU i GPL. upotreba:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - prikazuje ovaj ekran o pomo�i.\n"
@@ -715,6 +716,167 @@ msgstr "Radi zadovoljenja zavisnosti, slede�i paketi �e biti uklonjeni (%d MB)"
msgid "Removing failed"
msgstr "...kopiranje neuspelo"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq verzija %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Ovo je besplatan softver i mo�e biti redistribuiran pod uslovima GNU GPL.\n"
+"\n"
+"upotreba:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - koristi samo update medij.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - koristi samo medije prikazane sa zarezom.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - verbose mod.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - ne �tampa ima taga(default opcija ukoliko nije dat tag u "
+"komandi"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - �tampa sve tagove."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - �tampa ime taga: rpm ime datoteke (pretpostavljeno "
+"ukoliko nema taga"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - �tampa tag grupe: grupa."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - �tampa tag veli�ine: veli�ina."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - �tampa tag veli�ine: veli�ina."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - �tampa tag sa�etka: sa�etak."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - �tampa tag opisa: opis."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides - �tampa tag opcija: sve opcije (multi linije)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - �tampa tag zahteva: sve potrebe (multi linije)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - �tampa tag datoteka: sve datoteke (multi linije)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr " --conflicts - �tampa tag problema: svi problemi (multi linije)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - primorava na generisanje hdlist fajlova.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - prikazuje verziju, izdanje i arch sa imenom.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - �isti headers cache diremtorijum.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - uklanja pakete ukoliko je novija verdzija ve� "
+"instalirana.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - uklanja pakete ukoliko je novija verdzija ve� "
+"instalirana.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - selektuje sva poklapanja u komandnoj liniji.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - selektuje sva poklapanja u komandnoj liniji.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -952,14 +1114,6 @@ msgstr ""
"Ovo je besplatan softver i mo�e biti slobodno redistribuiran pod uslovima \n"
"GNU i GPL. upotreba:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - koristi samo update medij.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - koristi samo medije prikazane sa zarezom.\n"
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1103,39 +1257,39 @@ msgstr "urpmi: nepoznata opcija \"-%s\", proverite upotrebu sa --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "ne mogu da kreiram direktorijum [%s] za prijavljivanje gre�aka"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Samo superkorisnik mo�e instalirati pakete"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Jedan od slede�ih paketa je potreban da bi instalirali %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Potrebni su slede�i paket(i):"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "�ta je va� izbor ? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Lo� izbor, probajte ponovo\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1146,31 +1300,31 @@ msgstr ""
"%s\n"
"da li se sla�ete ?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "ne mogu da instaliram paket %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "nedostaje wget\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s je u konfliktu sa %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1181,7 +1335,7 @@ msgstr ""
"%s\n"
"da li se sla�ete ?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1189,7 +1343,7 @@ msgid ""
msgstr ""
"Radi zadovoljenja zavisnosti, slede�i paketi �e biti instalirani (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1198,32 +1352,32 @@ msgstr ""
"Morate da imate root ovla��enja da bi instalirali slede�e pakete:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "izvor paketa nije dostupan,izlazim..."
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Ubacite medij sa imenom %s u ure�aj %s"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Pritisnite enter kada budete spremni..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Slede�i paketi imaju neispravne potpise"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Da li �elite da nastavite konfiguraciju ?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (d/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1233,25 +1387,25 @@ msgstr ""
"Instalacija neuspela, nedostaju neki fajlovi.\n"
"Mo�da �elite da a�urirate va�u urpmi bazu podataka"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Instalaci�a neuspela"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "Instaliram %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "sve je ve� instalirano"
@@ -1271,10 +1425,6 @@ msgstr ""
"\n"
"upotreba:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - prikazuje listu paketa.\n"
@@ -1340,10 +1490,6 @@ msgstr " -g - prikazuje grupe sa imenom.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - prikazuje verziju sa imenom programa.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - prikazuje verziju, izdanje i arch sa imenom.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " imena ili rpm fajlovi dati u komandnoj liniji su potrebi.\n"
@@ -1705,13 +1851,6 @@ msgstr "nije prona�ena lista punog medija"
#~ msgid "problem reading hdlist file, trying again"
#~ msgstr "gre�ka pri u�itavanju hdlist fajla, poku�ajte ponovo"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - uklanja pakete ukoliko je novija verdzija ve� "
-#~ "instalirana.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr ""
#~ "medij \"%s\" poku�ava da koristi listu koja je u upotrebi, medij je "
diff --git a/po/sv.po b/po/sv.po
index 93b3a16c..68745dd9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi-sv\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-08-31 15:46+0000\n"
"Last-Translator: Mattias Newzella <newzella@linux.nu>\n"
"Language-Team: svenska <sv@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.0beta2\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "installerar %s\n"
@@ -34,34 +34,34 @@ msgstr ""
"Automatisk installation av paket...\n"
"Du beg�rde installation av paketet %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "�r det OK?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "OK"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Avbryt"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "JjYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (J/n) "
@@ -617,7 +617,7 @@ msgid "Installation failed on node %s"
msgstr "Installationen misslyckades p� nod %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "Installation �r m�jlig"
@@ -648,8 +648,9 @@ msgstr ""
"\n"
"anv�ndning:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - visar det h�r hj�lpmeddelandet.\n"
@@ -714,6 +715,167 @@ msgstr ""
msgid "Removing failed"
msgstr "...kopiering misslyckades"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq version %s\n"
+"Copyright � 2000, 2001, 2002 MandrakeSoft.\n"
+"Det h�r �r fri programvara och f�r distribueras enligt villkoren i GNU GPL.\n"
+"\n"
+"anv�ndning:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - anv�nd endast uppdateringsmedia.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - anv�nd endast media listat med komma.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr " --synthesis - anv�nd given synthesis ist�llet f�r urpmi db.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - utf�rligt l�ge.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - visa inte taggen \"name\" (antas om ingen tagg angivits "
+"p�"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - visa alla taggar."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - visa taggen \"name\": rpm-filnamnet (antas om ingen tagg "
+"angivits p�"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - visa taggen \"group\": grupp."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - visa taggen \"size\": storlek."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - visa taggen \"size\": storlek."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - visa taggen \"summary\": sammanfattning."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - visa taggen \"description\": beskrivning."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - visa taggen \"provides\": allt som tillhandah�lls (flera "
+"rader)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+" --requires - visa taggen \"requires\": allt som kr�vs (flera rader)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - visa taggen \"files\": alla filer (flera rader)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - visa taggen \"conflicts\": alla konflikter (flera rader)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --obsoletes - visa taggen \"obsoletes\": allt som ers�tts (flera "
+"rader)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - tvinga generering av hdlist-filer.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - visa version, utg�va och arkitektur med namn.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - rensa huvudcachekatalogen.\n"
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -f - tvinga generering av hdlist-filer.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - v�lj alla tr�ffar p� kommandoraden.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - v�lj alla tr�ffar p� kommandoraden.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -951,14 +1113,6 @@ msgstr ""
"\n"
"anv�ndning:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - anv�nd endast uppdateringsmedia.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - anv�nd endast media listat med komma.\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1096,39 +1250,39 @@ msgstr "urpmi: ok�nd flagga \"-%s\", anv�nd --help f�r hj�lp\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Kunde inte skapa katalog [%s] f�r felrapport"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Endast systemadministrat�rer f�r installera paket"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Ett av f�ljande paket �r n�dv�ndigt f�r att installera %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Ett av f�ljande paket �r n�dv�ndigt:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Vad �r ditt val? ( 1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Tyv�rr, felaktigt val, f�rs�k igen\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1139,31 +1293,31 @@ msgstr ""
"%s\n"
"OK?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "kan inte installera paket %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget saknas\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s �r i konflikt med %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1174,7 +1328,7 @@ msgstr ""
"%s\n"
"OK?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1183,7 +1337,7 @@ msgstr ""
"F�r att tillfredsst�lla beroenden kommer f�ljande paket att installeras (%d "
"MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1192,32 +1346,32 @@ msgstr ""
"Du m�ste vara root f�r att kunna installera f�ljande beroenden:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "kunde inte l�sa k�llan, avbryter"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "L�gg i media med namnet \"%s\" i enhet [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Tryck \"Enter\" vid klart..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "F�ljande paket har felaktiga signaturer"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Vill du forts�tta installationen?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1227,25 +1381,25 @@ msgstr ""
"Installationen misslyckades, vissa filer saknas.\n"
"Du b�r f�rs�ka uppdatera urpmi-databasen."
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Installationen misslyckades"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "distribuerar %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Prova att installera utan att kontrollera behov av andra filer? (j/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "F�rs�ka �nnu h�rdare att installera (--force)? (j/N)"
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "allt �r redan installerat"
@@ -1265,10 +1419,6 @@ msgstr ""
"\n"
"anv�ndning:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr " --synthesis - anv�nd given synthesis ist�llet f�r urpmi db.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - visa tillg�ngliga paket.\n"
@@ -1331,10 +1481,6 @@ msgstr " -g - visa grupper med namn.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - visa version och utg�va med namn.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - visa version, utg�va och arkitektur med namn.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " namn eller rpm-filer som anges p� kommandoraden f�rfr�gas.\n"
diff --git a/po/tg.po b/po/tg.po
index ee81726f..d945cb1e 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-02-04 19:06\n"
"Last-Translator: Roger Kovacs <rkovacs@khujandcomptech.dyn.tj>\n"
"Language-Team: Tajik\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.5\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "коргузории %s\n"
@@ -29,34 +29,34 @@ msgstr ""
"Коргузориши автоматикии қуттиҳо...\n"
"Шумо коргузориши куттии '%s'-ро талаб кардед\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Ин дуруст аст?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Ok"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Бекор кардан"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "НнNn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "ҲҳYy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (Ҳ/н) "
@@ -626,7 +626,7 @@ msgid "Installation failed on node %s"
msgstr "Коргузорӣ нагузашт"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "Коргузорӣ нагузашт"
@@ -655,8 +655,9 @@ msgstr ""
"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
"шавад."
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
#, fuzzy
msgid " --help - print this help message.\n"
msgstr " --ҳама \t - чопи ҳама тэгҳо."
@@ -721,6 +722,159 @@ msgstr ""
msgid "Removing failed"
msgstr "нусхаи [%s] нагузашт"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
+"шавад."
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --хомӯш - номи тэгро чоп накунед (пешфарз агар ягон тэг дар фармон "
+"набошад"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --ҳама \t - чопи ҳама тэгҳо."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --ном - чопи номи тэг: номи файли rpm (қабул шуд агар тэг дода "
+"нашуда бошад"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --гурӯҳ - чопи гурӯҳи тэг: гурӯҳ."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --ҳаҷм - чопи ҳаҷми тэг: ҳаҷм."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --ҳаҷм - чопи ҳаҷми тэг: ҳаҷм."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --ҷамъбаст - чопи ҷамъбасти тэг: ҷамъбаст."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --тасвирот - чопи тасвироти тэг: тасвирот."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --таъминот - чопи таъминоти тэг: ҳама таъминот (сатрҳои зиёд)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --дархостҳо - чопи дархостҳои тэг: ҳама дархостҳо (сатрҳои зиёд)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --файлҳо - чопи файлҳои тэг: ҳама файлҳо (сатрҳои зиёд)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --зиддиятҳо - чопи зиддиятҳои тэг: ҳама зиддиятҳо (сатрҳои зиёд)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+" --кӯҳнашудаҳо - чопи кӯҳнашудаҳои тэг: ҳама кӯҳнашудаҳо (сатрҳои зиёд)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " сатри фармон вале бе номи қутти)."
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " --ҳама \t - чопи ҳама тэгҳо."
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " --ҳама \t - чопи ҳама тэгҳо."
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " --ҳама \t - чопи ҳама тэгҳо."
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " --ҳама \t - чопи ҳама тэгҳо."
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -951,14 +1105,6 @@ msgstr ""
"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
"шавад."
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1084,41 +1230,41 @@ msgstr "urpmi: хосияти номаълум \"-%s\", тафтиши исти�
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, fuzzy, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "таҷзияи дурсти [%s] дар қиммати \"%s\" номумкин"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
#, fuzzy
msgid "Only superuser is allowed to install packages"
msgstr ""
"Танҳо ба фавқулкорванд кор гузоштани қуттиҳои маҳаллӣ рухсат дода шудааст"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Яке аз қуттиҳои зерин барои коргузории %s даркор аст:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Яке аз қуттиҳои зерин даркор аст:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Интихоби шумо чист? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Мебахшед, интихоби бад боз кӯшиш кунед\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1126,32 +1272,32 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr ""
"Танҳо ба фавқулкорванд кор гузоштани қуттиҳои маҳаллӣ рухсат дода шудааст"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1160,7 +1306,7 @@ msgid ""
msgstr ""
"барои афзоиш баъзе қуттиҳо бояд хориҷ шаванд, ин ҳоло дастгирӣ нашудааст\n"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1168,42 +1314,42 @@ msgid ""
msgstr ""
"Барои қаноатмандии тобеиятҳо қуттиҳои зерин кор гузошта мешаванд (%d МБ)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "қуттиҳои сарчашмавӣ гирифтан номумкин, кандашавӣ"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Лутфан муҳити бо номи \"%s\" ба дастгоҳи [%s] дароред"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "Вақте, ки ин тайёр enter-ро пахш кунед..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "Қуттиҳои зерин соҳиби %s: %s"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
#, fuzzy
msgid " (y/N) "
msgstr " (Ҳ/н) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1211,25 +1357,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "Коргузорӣ нагузашт"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "коргузории %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Коргузориро бе тафтиши тобеиятҳо кӯшиш кунем? (Ҳ/Н) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Коргузориро боз устувортар (--force) кӯшиш кунем? (Ҳ/Н) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "ҳамааш аллакай кор гузошта шуд"
@@ -1246,10 +1392,6 @@ msgstr ""
"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
"шавад."
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
#, fuzzy
msgid " --list - list available packages.\n"
@@ -1313,10 +1455,6 @@ msgstr " --гурӯҳ - чопи гурӯҳи тэг: гурӯҳ."
msgid " -r - print version and release with name also.\n"
msgstr " сатри фармон вале бе номи қутти)."
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
@@ -1437,10 +1575,6 @@ msgstr ""
#~ msgid "usage: urpme [-a] [--auto] <packages...>\n"
#~ msgstr "истифода: urpmi.removemedia [-a] <ном> ..."
-#, fuzzy
-#~ msgid " -h - print this help message.\n"
-#~ msgstr " --ҳама \t - чопи ҳама тэгҳо."
-
#~ msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
#~ msgstr "urpmq: хосияти номаълум \"-%s\", тафтиши истифода бо --help\n"
@@ -1825,10 +1959,6 @@ msgstr ""
#~ msgstr " --гурӯҳ - чопи гурӯҳи тэг: гурӯҳ."
#, fuzzy
-#~ msgid " -r - print version and release too with name.\n"
-#~ msgstr " сатри фармон вале бе номи қутти)."
-
-#, fuzzy
#~ msgid "read synthesis file [%s]"
#~ msgstr "хондани файли depslist-и [%s]"
diff --git a/po/th.po b/po/th.po
index 6a0faeda..a063bcb3 100644
--- a/po/th.po
+++ b/po/th.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 0.9.6\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "���ѧ�Դ��� %s\n"
@@ -28,34 +28,34 @@ msgstr ""
"��õԴ��� Package Ẻ�ѵ��ѵ...\n"
"�س�����͡���еԴ��� Package %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "��ŧ�����Ѻ"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "��ŧ"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "¡��ԡ"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "Yy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (Y/n) "
@@ -604,7 +604,7 @@ msgid "Installation failed on node %s"
msgstr "��õԴ��駺� %s ��������"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "��õԴ�������ö����"
@@ -636,8 +636,9 @@ msgstr ""
"\n"
"usage:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - ������ͤ�������\n"
@@ -700,6 +701,159 @@ msgstr "���ͤ����١��ͧ�ͧ���������������ҧ�������ࡨ�ҧ��Ǩж١ź���(%d
msgid "Removing failed"
msgstr "...��äѴ�͡�������"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq version %s\n"
+"Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - �������Ѿവ�����\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - ���͡��੾������·��١��鹴�������ͧ�����١���\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr " --synthesis - use the synthesis given instead of urpmi db.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - ������\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr " --quiet - ����ͧ�������� Tag (default ��� tag �����١�к�� command"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - ����� tag ������"
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr " --name - �������� tag: ������� rpm (���ص��� tag �����١�к��"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - ����� tag group: group."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - ����좹Ҵ tag:��Ҵ"
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - ����좹Ҵ tag:��Ҵ"
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - ����� tag summary: summary"
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - ����� tag ��������´ : ��������´"
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides -����� tag provides: all provides (���º�÷Ѵ). "
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - ����� tag ����ͧ���:����ͧ��÷�����(���º�÷Ѵ)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - ����� tag files: file ������ (���º�÷Ѵ)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr " --conflicts -����� tag �����ҡѹ�����:��ҡѹ����������(���º�÷Ѵ)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr " --obsoletes -����� tag ���������:������������(���º�÷Ѵ)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - �ѧ�Ѻ������ҧ��� hdlist\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - ������蹷������, �������� arch ���������.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - �Ӥ������Ҵ��ǹ headers �ͧ���礵���� cache \n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr " -u - ź��ࡨ�����ࡨ���ա����ա�õԴ�����������.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -u - ź��ࡨ�����ࡨ���ա����ա�õԴ�����������.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - ���͡���������ç�Ѻ�����\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - ���͡���������ç�Ѻ�����\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -931,14 +1085,6 @@ msgstr ""
"\n"
"usage:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - �������Ѿവ�����\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - ���͡��੾������·��١��鹴�������ͧ�����١���\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1073,39 +1219,39 @@ msgstr "urpmi: ������͡������ѡ \"-%s\" ��Ǩ�ͺ�����ҡ --help\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "�������ö���ҧ���礵���� [%s] ����Ѻ��§ҹ�ѡ"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "superuser ��ҹ�鹷�����Է�ԵԴ��� packages"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "˹��� Packages ���仹���ͧ��㹡�èеԴ��� %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "˹��� Packages ���仹���ͧ���Ѻ��õԴ��� "
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "��ͧ������͡���ä�Ѻ (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "������͡���١��ͧ �ͧ�����Ѻ\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1116,31 +1262,31 @@ msgstr ""
"%s\n"
"�س��繴����������?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "�������ö�Դ�����ࡨ %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "wget ����\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s �Ѵ��駡Ѻ %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1151,14 +1297,14 @@ msgstr ""
"%s\n"
"�س������ӡ��ź����������?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr "���ͷ�����㢻ѭ�ҡ����ҡѹ�� packages ���仹��ж١�Դ��� (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1167,32 +1313,32 @@ msgstr ""
"�س�е�ͧ���ٷ㹡�õԴ��� ����������� :\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "�������ö���¡ source package,���ѧ¡��ԡ"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "��س�����ػ�ó����ժ��� \"%s\" � [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "��سҡ� enter ����;����"
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "��ࡨ���仹���� signatures ������١��ͧ"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "�س�ѧ��ͧ��èеԴ����ա����������� ?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1202,25 +1348,25 @@ msgstr ""
"��õԴ�����������պҧ�����Ҵ����\n"
"���й����ӡ���Ѿവ�ҹ������ urpmi"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "��õԴ�����������"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "���ѧᨡ���� %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "��ͧ��÷��ͧ�Դ����·������ͧ��ͨ�ͺ������ҡѹ��? (y/N)"
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "��ͧ��÷��ͧ�ѧ�Ѻ�Դ��� (--force)? (y/N)"
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "�ء���ҧ��١�Դ������º��������"
@@ -1241,10 +1387,6 @@ msgstr ""
"\n"
"usage:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr " --synthesis - use the synthesis given instead of urpmi db.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - �ʴ���ª�����ࡨ���������\n"
@@ -1303,10 +1445,6 @@ msgstr " -g - ������������������\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - �����������蹡Ѻ����ʾ��������\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - ������蹷������, �������� arch ���������.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr "���ͧ͢������ͧ͢ rpm ������ҡ����觷��������ѧ�١����\n"
@@ -1653,11 +1791,6 @@ msgstr "��辺��¡������Ѻ�����"
#~ msgid "problem reading hdlist file, trying again"
#~ msgstr "�ջѭ��㹡����ҹ��� hdlist ���ѧ�����������ա����"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr " -u - ź��ࡨ�����ࡨ���ա����ա�õԴ�����������.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr "�ػ�ó�\"%s\"���������͡���ػ�ó���������, medium ignored"
diff --git a/po/tr.po b/po/tr.po
index ef84dcd4..5bf25ec3 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -13,7 +13,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-20 13:28+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2003-01-14 11:46+0200\n"
"Last-Translator: Ömer Fadıl USTA <omer_fad@hotmail.com>\n"
"Language-Team: Turkish <kde-i18n-tr@kde.org>\n"
@@ -647,8 +647,9 @@ msgstr ""
"\n"
"kullanımı:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - bu yardım mesajını görüntüler.\n"
@@ -708,6 +709,165 @@ msgstr ""
msgid "Removing failed"
msgstr "Kaldırma başarısız"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq sürüm %s\n"
+"TelifHakkı (C) 2000, 2001, 2002 MandrakeSoft.\n"
+"Bu bir serbest yazılımdır ve GNU GPL Lisansı altında tekrar dağıtılabilir.\n"
+"\n"
+"Kullanımı:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - sadece güncelleme ortamını kullan.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+" --media - sadece belirtilen ortamları kullan(Birden fazla ise "
+"virgülle ayırın).\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr " --synthesis - urpmi veritabanı yerine verilen bireşimi kullan.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - kalabalık kipi.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet etiket isimlerini göstermez (etiket girilmediği sürece ön "
+"tanımlıdır"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - tüm etiketler gösterilir."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - isim: rpm dosyaismi etiketi gösterilir (paket ismi "
+"olmaksızın"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - grup: grup etiketini gösterir."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - boyut: boyut etiketi gösterilir."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - boyut: boyut etiketi gösterilir."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - özet: özet etiketi gösterilir."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " -description - açıklama: açıklama etiketi gösterilir."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - yazdırma etiketi sağlamak: tüm sağlananlar(çoklu satır) "
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - gerekli: gerekenler etiketini gösterir."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - dosyalar: tüm dosyalar etiketlerini gösterir."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr " --conflicts - çelişkiler: tüm çelişenler etiketleri gösterilir."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr " --obsoletes - süprüntü: tüm eskiler etiketleri gösterilir."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - hdlist dosyalarını oluşum için zorla.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - isminin yanında sürüm ve kurnazlığını yazar.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr ""
+" -c - 'başlıklar arabelleği'nin bulunduğu dizini temizle.\n"
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -f - hdlist dosyalarını oluşum için zorla.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - ifadeye uyan tüm paketleri seçer. \n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - ifadeye uyan tüm paketleri seçer. \n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -946,16 +1106,6 @@ msgstr ""
"Bu bir serbest yazılımdır ve GNU GPL Lisansı altında tekrar dağıtılabilir.\n"
"kullanım:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - sadece güncelleme ortamını kullan.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-" --media - sadece belirtilen ortamları kullan(Birden fazla ise "
-"virgülle ayırın).\n"
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1264,10 +1414,6 @@ msgstr ""
"\n"
"Kullanımı:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr " --synthesis - urpmi veritabanı yerine verilen bireşimi kullan.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - tüm paketleri göster\n"
@@ -1327,10 +1473,6 @@ msgstr " -g - isminin yanında grupları da yazar.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - isminin yanıda sürüm numarasını da yazar.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - isminin yanında sürüm ve kurnazlığını yazar.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 68f7fe8b..47a62865 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2000-06-16 08:10+09:00\n"
"Last-Translator: Dmytro Koval'ov <kov@tokyo.email.ne.jp>\n"
"Language-Team: Ukrainian\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=koi8-u\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "���������� %s\n"
@@ -26,34 +26,34 @@ msgid ""
"You requested installation of package %s\n"
msgstr ""
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "�����?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "���"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "���ͦ����"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "��Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "��Yy"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (�/�) "
@@ -609,7 +609,7 @@ msgid "Installation failed on node %s"
msgstr "��������� �������"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "��������� �������"
@@ -636,8 +636,9 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr ""
@@ -700,6 +701,133 @@ msgstr ""
msgid "Removing failed"
msgstr ""
+#: ../urpmf_.c:26
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+
+#: ../urpmf_.c:38
+msgid " --all - print all tags.\n"
+msgstr ""
+
+#: ../urpmf_.c:39
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+
+#: ../urpmf_.c:41
+msgid " --group - print tag group: group.\n"
+msgstr ""
+
+#: ../urpmf_.c:42
+msgid " --size - print tag size: size.\n"
+msgstr ""
+
+#: ../urpmf_.c:43
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr ""
+
+#: ../urpmf_.c:44
+msgid " --summary - print tag summary: summary.\n"
+msgstr ""
+
+#: ../urpmf_.c:45
+msgid " --description - print tag description: description.\n"
+msgstr ""
+
+#: ../urpmf_.c:46
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:47
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:48
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:49
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:50
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:51
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr ""
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+
+#: ../urpmf_.c:57
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:58
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -892,14 +1020,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1019,41 +1139,41 @@ msgstr ""
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
#, fuzzy
msgid "Only superuser is allowed to install packages"
msgstr ""
"������������� ������Φ ������ ��������� Ԧ���� ���������� ��ͦΦ��������"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, fuzzy, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "���Ҧ��� ���� �� ��������� ����Ԧ�:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "���Ҧ��� ���� �� ��������� ����Ԧ�:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "��� ��¦�? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "��צ���� ��¦�, ��������� �� ���\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1061,32 +1181,32 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr ""
"������������� ������Φ ������ ��������� Ԧ���� ���������� ��ͦΦ��������"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1094,7 +1214,7 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1103,42 +1223,42 @@ msgstr ""
"������Φ ������ ������ ���������Φ ��� ����, ��� ������������ ��������Ԧ (%"
"d ��)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "������� ����-����� %s � ������ %s"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "�����Φ�� Enter Ц��� ��˦������..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr " � ������ ͦ����� � ��¦ %s: %s\n"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
#, fuzzy
msgid " (y/N) "
msgstr " (�/�) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1146,25 +1266,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "��������� �������"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "���������� %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "���������� ��������� ��� ����צ��� �����������? (�/�) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "���������� ��������� ��������� (--force)? (�/�) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "��� ��� �����������"
@@ -1179,10 +1299,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr ""
@@ -1236,10 +1352,6 @@ msgstr ""
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/urpmi.pot b/po/urpmi.pot
index db245203..1d7db97e 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-01-22 13:48+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+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"
@@ -629,8 +629,9 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr ""
@@ -688,6 +689,133 @@ msgstr ""
msgid "Removing failed"
msgstr ""
+#: ../urpmf_.c:26
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+
+#: ../urpmf_.c:38
+msgid " --all - print all tags.\n"
+msgstr ""
+
+#: ../urpmf_.c:39
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+
+#: ../urpmf_.c:41
+msgid " --group - print tag group: group.\n"
+msgstr ""
+
+#: ../urpmf_.c:42
+msgid " --size - print tag size: size.\n"
+msgstr ""
+
+#: ../urpmf_.c:43
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr ""
+
+#: ../urpmf_.c:44
+msgid " --summary - print tag summary: summary.\n"
+msgstr ""
+
+#: ../urpmf_.c:45
+msgid " --description - print tag description: description.\n"
+msgstr ""
+
+#: ../urpmf_.c:46
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:47
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:48
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:49
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:50
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:51
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr ""
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+
+#: ../urpmf_.c:57
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:58
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -880,14 +1008,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1159,10 +1279,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr ""
@@ -1216,10 +1332,6 @@ msgstr ""
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/uz.po b/po/uz.po
index 7bf6e7cc..742e1d42 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2001-02-28 11:10-5\n"
"Last-Translator: Sherzod Mamatkulov <mamatkulov@yahoo.com>\n"
"Language-Team: Uzbek <bobir_is@yahoo.com>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "%s o'rnatilmoqda\n"
@@ -25,34 +25,34 @@ msgid ""
"You requested installation of package %s\n"
msgstr ""
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Bo'ladimi?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "Bo'pti"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Bekor qilish"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "JjNnYy"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "Hh"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (H/y) "
@@ -602,7 +602,7 @@ msgid "Installation failed on node %s"
msgstr "O'rnatish o'xshamadi"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
#, fuzzy
msgid "Installation is possible"
msgstr "O'rnatish o'xshamadi"
@@ -629,8 +629,9 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr ""
@@ -692,6 +693,133 @@ msgstr ""
msgid "Removing failed"
msgstr ""
+#: ../urpmf_.c:26
+#, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr ""
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpmf_.c:35
+msgid " --verbose - verbose mode.\n"
+msgstr ""
+
+#: ../urpmf_.c:36
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+
+#: ../urpmf_.c:38
+msgid " --all - print all tags.\n"
+msgstr ""
+
+#: ../urpmf_.c:39
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+
+#: ../urpmf_.c:41
+msgid " --group - print tag group: group.\n"
+msgstr ""
+
+#: ../urpmf_.c:42
+msgid " --size - print tag size: size.\n"
+msgstr ""
+
+#: ../urpmf_.c:43
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr ""
+
+#: ../urpmf_.c:44
+msgid " --summary - print tag summary: summary.\n"
+msgstr ""
+
+#: ../urpmf_.c:45
+msgid " --description - print tag description: description.\n"
+msgstr ""
+
+#: ../urpmf_.c:46
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:47
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:48
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:49
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:50
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr ""
+
+#: ../urpmf_.c:51
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr ""
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpmf_.c:53
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+
+#: ../urpmf_.c:57
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:58
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -884,14 +1012,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr ""
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1011,40 +1131,40 @@ msgstr ""
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
#, fuzzy
msgid "Only superuser is allowed to install packages"
msgstr "Faqat administrator mahalliy paketlarni o'rnatishi mumkin"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, fuzzy, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "Quyidagi paketlardan biri kerak:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "Quyidagi paketlardan biri kerak:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Nimani tanlaysiz? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Uzr o'xshamadi, boshqasini tanlang\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1052,31 +1172,31 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "Faqat administrator mahalliy paketlarni o'rnatishi mumkin"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1084,7 +1204,7 @@ msgid ""
"do you agree ?"
msgstr ""
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1092,42 +1212,42 @@ msgid ""
msgstr ""
"Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Iltimos %2$s nomli %1$s ni kiriting"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
#, fuzzy
msgid "Press Enter when ready..."
msgstr "Tugagandan so'ng enterni bosing..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
#, fuzzy
msgid "The following packages have bad signatures"
msgstr "Quyidagi paketlarda %s bor: %s\n"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
#, fuzzy
msgid " (y/N) "
msgstr " (H/y) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1135,25 +1255,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "O'rnatish o'xshamadi"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, fuzzy, c-format
msgid "distributing %s\n"
msgstr "%s o'rnatilmoqda\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Bog'liqliklarni tekshirmasdan o'rnatib ko'raymi? (h/Y) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Kuchliroq o'rnatishga harakat qilaymi (--majburlab)? (h/Y) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "hammasi allaqachon o'rnatilgan"
@@ -1168,10 +1288,6 @@ msgid ""
"usage:\n"
msgstr ""
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr ""
@@ -1225,10 +1341,6 @@ msgstr ""
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 855a51a0..23e2ebe7 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-20 13:28+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2003-01-21 17:04+0700\n"
"Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
"Language-Team: Gnome-Vi <Gnomevi-list@lists.sourceforge.net>\n"
@@ -653,8 +653,9 @@ msgstr ""
"\n"
"cách dùng:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - in thông tin trợ giúp này.\n"
@@ -712,6 +713,169 @@ msgstr "Để thỏa mãn các phụ thuộc, các gói sau đây sẽ được
msgid "Removing failed"
msgstr "Gỡ bỏ không được"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\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 urpmq %s\n"
+"Bản quyền (C) 2000, 2001,2002 MandrakeSoft.\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"
+"sử dụng:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - chỉ dùng phương tiện cập nhật.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - chỉ dùng phương tiện được liệt kê bởi dấu phẩy.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+" --synthesis - dùng tổng hợp (synthesis) nhận được để thay cho urpmi "
+"db.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - chế độ verbose.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - không in ra tên của tag (mặc định nếu không đưa tag vào "
+"lệnh"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - in ra toàn bộ tag."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - in tên tag: tên tập tin rpm (giả sử không đưa tag vào"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - in ra nhóm tag: nhóm."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - in ra kích thước tag: kích thước."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - in ra kích thước tag: kích thước."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - in ra tóm tắt tag: tóm tắt."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - in ra mô tả tag: mô tả."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - in ra các cung cấp tag: toàn bộ cung cấp (đa dòng)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - in ra yêu cầu tag: toàn bộ yêu cầu (đa dòng)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr ""
+" --files - in ra các tập tin tag: toàn bộ các tập tin (đa dòng)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr ""
+" --conflicts - in ra các xung đột tag: toàn bộ các xung đột (đa dòng)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr " --obsoletes - in ra tag hết hạn: toàn bộ obsolete (đa dòng)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - cố tạo các tập tin hdlist.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - in phiên bản, phát hành và arch với tên.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - xoá thư mục cache headers.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - bỏ gói tin nếu có phiên bản tốt hơn đã được cài đặt.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - bỏ gói tin nếu có phiên bản tốt hơn đã được cài đặt.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - chọn toàn bộ các gói tin khớp với sự diễn đạt.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - chọn toàn bộ các gói tin khớp với sự diễn đạt.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -956,14 +1120,6 @@ msgstr ""
"\n"
"sử dụng:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - chỉ dùng phương tiện cập nhật.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - chỉ dùng phương tiện được liệt kê bởi dấu phẩy.\n"
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - dùng synthesis nhận được thay cho urpmi db.\n"
@@ -1266,12 +1422,6 @@ msgstr ""
"\n"
"sử dụng:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-" --synthesis - dùng tổng hợp (synthesis) nhận được để thay cho urpmi "
-"db.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - liệt kê các gói tin hiện có.\n"
@@ -1331,10 +1481,6 @@ msgstr " -g - in ra các nhóm với tên.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - in ra phiên bản và phát hành với tên.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - in phiên bản, phát hành và arch với tên.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " tên hay tập tin rpm có trong dòng lệnh được yêu cầu.\n"
@@ -1602,12 +1748,6 @@ msgstr "Không tìm thấy danh sách phương tiện đầy đủ"
#~ msgid "keeping only files referenced in provides"
#~ msgstr "chỉ giữ các tập tin được tham chiếu trong các cung cấp"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - bỏ gói tin nếu có phiên bản tốt hơn đã được cài đặt.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr ""
#~ "phương tiện \"%s\" cố sử dụng một danh sách đang được dùng, phương tiện "
diff --git a/po/wa.po b/po/wa.po
index e6fe3001..31b9adcf 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 1999-08-25 11:07+0200\n"
"Last-Translator: Lorint Hendschel <LorintHendschel@skynet.be>\n"
"Language-Team: walon <linux-wa@chanae.alphanet.ch>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "dj' astale %s\n"
@@ -28,34 +28,34 @@ msgstr ""
"Astalaedje otomatike des pacaedjes...\n"
"Vos avoz dmand� l' astalaedje do pacaedje %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "Totafwait est-i comuf�t?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "'l est bon"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "Rinonc�"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "OoAaYyWw"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (O/n) "
@@ -619,7 +619,7 @@ msgid "Installation failed on node %s"
msgstr "L' astalaeje a fwait berwete sol nuk %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "L' astalaedje est possibe"
@@ -651,8 +651,9 @@ msgstr ""
"\n"
"po s'�� siervi:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - mostere ci messaedje d'�aidance chal.\n"
@@ -719,6 +720,172 @@ msgstr ""
msgid "Removing failed"
msgstr "Li oistaedje a fwait berwete"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq mod�ye %s\n"
+"Copyright � 2000, 2001, 2002 MandrakeSoft.\n"
+"�ouci est on libe programe et pout esse cossem� so les termes del licince "
+"GPL.\n"
+"\n"
+"Po s'�� siervi:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - eploy� kel sopoirt di metaedje a djo�.\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr ""
+" --media - eploy� r�n k'�les sopoirts din�s, separ�s pa des comas.\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr ""
+" --synthesis - eploy� l'�fitch� d'�sinteze din� purade kel\n"
+" b�ze di dn�yes d'�urpmi.\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - m�de badjawe.\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - �n n�n h�yner l'�no des etiketes (pr�metou si nole "
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - h�yner totes les etiketes."
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr ""
+" --name - h�yner l'�etikete do no di fitch� rpm (sup�z� si nole"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - h�yner l'�etikete di groupe: group."
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - h�yner l'�etikete del grandeu: size."
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - h�yner l'�etikete del grandeu: size."
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - h�yner l' etikete di rascourti: summary."
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - h�yner l' etikete di discrijhaedje: description."
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides - h�yner l'�etikete provides (sacwant�s royes)."
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - h�yner l'�etikete requires (sacwant�s royes)."
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - h�yner l'�etikete files (tos les fitch�s)."
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr " --conflicts - h�yner l'�etikete conflicts (sacwant�s royes)."
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr " --obsoletes - h�yner l'�etikete obsoletes (sacwant�s royes)."
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - foirci l'�askepiaedje des fitch�s �hdlist�.\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr ""
+" -f - mostere li mod�ye et release, eyet l'��rtchitecteure avou "
+"l'�no.\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - nety� l' ridant muchete des tiestires.\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+" -u - oister l'�pacaedje si ene meyeuse mod�ye est ddja "
+"astal�ye.\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr ""
+" -u - oister l'�pacaedje si ene meyeuse mod�ye est ddja "
+"astal�ye.\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr ""
+" -a - tchoezi tos les pacaedjes ki corespond�t al ratourneure.\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr ""
+" -a - tchoezi tos les pacaedjes ki corespond�t al ratourneure.\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -964,15 +1131,6 @@ msgstr ""
"\n"
"po s'�� siervi:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - eploy� kel sopoirt di metaedje a djo�.\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr ""
-" --media - eploy� r�n k'�les sopoirts din�s, separ�s pa des comas.\n"
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr ""
@@ -1123,39 +1281,39 @@ msgstr ""
"�ou ki s'�pout f� avou les pacaedjes rpm binaires cwand c'�est k'�on "
"tchoezixh �--install-src�"
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "dji n'�sai askepy� l'�ridant [%s] po f� des rapoirts di bug"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr "eployant on evironmint specifike so %s\n"
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "Seulmint li super-uzeu a l' droet d' astaler des pacaedjes"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "I gn a mez�jhe d' onk des pacaedjes ki shuv�t po-z astaler %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "I gn a mez�jhe d' onk des pacaedjes ki shuv�t:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "K� tchoezixhoz vs? (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "Mwaijhe tchuze, say�z co ene feye\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1166,31 +1324,31 @@ msgstr ""
"%s\n"
"estoz vs d'�acoird?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, c-format
msgid "in order to install %s"
msgstr "po-z astaler %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr "c�ze di %s ki n' est n�n satisfy�"
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr "c�ze di %s ki n'�est n�n la"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr "c�ze di conflits avou %s"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr "n�n dmand�"
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1202,7 +1360,7 @@ msgstr ""
"%s\n"
"estoz vs d'�acoird?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
@@ -1211,7 +1369,7 @@ msgstr ""
"Po satisfy� les aloyaedjes, les pacaedjes aloy�s ki shuv�t vont esse astal�s "
"(%d Mo)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1220,32 +1378,32 @@ msgstr ""
"Vos dvoz esse root po-z astaler les aloyances shuvantes:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "dji n'�a savou prinde les pacaedjes so�rdants, dji lai toumer"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "S'�i vs plait metoz li sopoirt lom� �%s� el �ndjin [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "Tapez so �enter� cwand c' est fwait..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "Les pacaedjes ki shuv�t ont ene mwaijhe sinateure"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "Voloz vs continuwer avou l'astalaedje?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (o/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1256,25 +1414,25 @@ msgstr ""
"%s\n"
"Vos dvr�z motoit mete a djo� li b�ze di dn�yes urpmi."
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "L' astal�cion a fwait berwete"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "dji distribuwe %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Say� d' astaler sin verify� les aloyaedjes? (o/N) "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Say� d' astaler co pus foirt (--force)? (o/N) "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "tot a ddja st� astal�"
@@ -1295,12 +1453,6 @@ msgstr ""
"\n"
"Po s'�� siervi:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr ""
-" --synthesis - eploy� l'�fitch� d'�sinteze din� purade kel\n"
-" b�ze di dn�yes d'�urpmi.\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - djiv�ye des pacaedjes k'�i gn a.\n"
@@ -1364,12 +1516,6 @@ msgstr " -g - h�yner les groupes ossu avou l' no.\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - mostere li no, limeros di mod�ye eyet release.\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr ""
-" -f - mostere li mod�ye et release, eyet l'��rtchitecteure avou "
-"l'�no.\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " les nos ou fitch�s rpm din�s sol roye di comande sont rcwerous.\n"
@@ -1635,13 +1781,6 @@ msgstr "nole djiv�ye des sopoirts etire di trov�ye"
#~ msgid "keeping only files referenced in provides"
#~ msgstr "dji w�de ki les fitch�s dn�s dins les provides"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr ""
-#~ " -u - oister l'�pacaedje si ene meyeuse mod�ye est ddja "
-#~ "astal�ye.\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr ""
#~ "li sopoirt �%s� saye d'�eploy� ene djiv�ye dedja eployeye, dji passe "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ad9bb6f5..55dc5108 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2003-01-15 02:36+0800\n"
"Last-Translator: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
"Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=gb2312\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "���ڰ�װ %s\n"
@@ -30,34 +30,34 @@ msgstr ""
"�Զ���װ������...\n"
"��Ҫ��װ������ %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "����������?"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "ȷ��"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "ȡ��"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "nN����"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "yY��"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (��(Y)/��(n)) [��] "
@@ -606,7 +606,7 @@ msgid "Installation failed on node %s"
msgstr "�ڽڵ� %s ��װʧ��"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "���԰�װ"
@@ -637,8 +637,9 @@ msgstr ""
"\n"
"�÷�:\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - ��ӡ������Ϣ��\n"
@@ -696,6 +697,157 @@ msgstr "Ϊ���������Ҫ��, ��Ҫɾ������������ (%d MB)"
msgid "Removing failed"
msgstr "ɾ��ʧ��"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq �汾 %s\n"
+"��Ȩ (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"������������, �������� GNU GPL ���·�����\n"
+"\n"
+"�÷�:\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - ֻʹ���������ʡ�\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - ֻʹ���г��Ľ��ʡ�\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr " --synthesis - ʹ��ָ���� synthesis ������ urpmi db��\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v -��ϸ����ʾ��\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr " --quiet - ����ӡ��������(���û����������ָ����ǩ"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - ��ӡȫ����ǩ��"
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr " --name - ��ӡ���Ʊ�ǩ: rpm �ļ��� (����û����������"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - ��ӡ�����ǩ: ���顣"
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - ��ӡ��С��ǩ: ��С��"
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - ��ӡ��С��ǩ: ��С��"
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - ��ӡժҪ��ǩ: ժҪ��"
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description -��ӡ������ǩ: ������"
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr " --provides - ��ӡ�ṩ��ǩ: �ṩ�����г���"
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - ��ӡ��Ҫ��ǩ: ��Ҫ�����г���"
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - ��ӡ�ļ���ǩ: ���е��ļ���"
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr " --conflicts - ��ӡ��ͻ��ǩ: ���еij�ͻ��"
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr " --obsoletes - ��ӡ�ϳ���ǩ: ���б��ϳ��İ���"
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - ǿ������ hdlist �ļ���\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - ������һ���ӡ�汾, ���кź�ƽ̨��\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - ֱ�����������ͷ���档\n"
+
+#: ../urpmf_.c:54
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr ""
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -f - ǿ������ hdlist �ļ���\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - ��������ѡ��ƥ�����ʽ�����а���\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - ��������ѡ��ƥ�����ʽ�����а���\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -926,14 +1078,6 @@ msgstr ""
"\n"
"�÷�:\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - ֻʹ���������ʡ�\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - ֻʹ���г��Ľ��ʡ�\n"
-
#: ../urpmi_.c:79
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - ʹ��ָ���� synthesis ������ urpmi db��\n"
@@ -1063,39 +1207,39 @@ msgstr "urpmi: δ֪ѡ�-%s��, ��--help ����÷�\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr "�Զ����� rpm �ļ�ʹ�� --install-src ����ﵽʲôЧ��"
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "�޷��������ϱ����Ŀ¼ [%s]"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr "�� %s ʹ��ָ������\n"
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "ֻ���������û���װ������"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "��Ҫ����������֮һ���ܰ�װ %s:"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "��Ҫ����������֮һ:"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "����������ѡ��: (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "�Բ���, ѡ����Ч, ������һ��\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1106,31 +1250,31 @@ msgstr ""
"%s\n"
"������ ?"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, c-format
msgid "in order to install %s"
msgstr "Ϊ�˰�װ %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr "ԭ���Dz����� %s"
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, c-format
msgid "due to missing %s"
msgstr "ԭ���Ƕ�ʧ %s"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, c-format
msgid "due to conflicts with %s"
msgstr "ԭ������ %s ��ͻ"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr "���"
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1141,14 +1285,14 @@ msgstr ""
"%s\n"
"��ͬ����?"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr "�ҽ����ⰲװ���������� (%d MB), �����������Ҫ��"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1157,32 +1301,32 @@ msgstr ""
"�������� root ���ݰ�װ����������������Ҫ��������:\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "�޷���ȡԴ������, ��ֹ"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "������ǩ��%s���Ľ��ʵ��豸 [%s]"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "׼���ú� Enter ��..."
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "������������ǩ���д���"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "���������װ��?"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1193,25 +1337,25 @@ msgstr ""
"%s\n"
"��������Ҫ�������� urpmi ���ݿ�"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "��װʧ��"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "���ڷַ� %s\n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "���Ժ�������Լ�����װ��? (��(y)/��(N)) [��] "
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "���Ը����ҵİ�װ��ʽ��? (ʹ�� --force) (��(y)/��(N)) [��] "
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "ȫ����װ���"
@@ -1231,10 +1375,6 @@ msgstr ""
"\n"
"�÷�:\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr " --synthesis - ʹ��ָ���� synthesis ������ urpmi db��\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --list - �г����õ���������\n"
@@ -1290,10 +1430,6 @@ msgstr " -g - ��ӡ������\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - ������һ���ӡ�汾�ͷ��кš�\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - ������һ���ӡ�汾, ���кź�ƽ̨��\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " ��Ҫ�������и������ƻ� rpm �ļ���\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 94050bce..b7950b71 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: urpmi 1.7\n"
-"POT-Creation-Date: 2003-01-13 23:34+0100\n"
+"POT-Creation-Date: 2003-01-22 14:48+0100\n"
"PO-Revision-Date: 2002-09-02 03:10+0800\n"
"Last-Translator: Kenduest Lee <kenduest@i18n.linux.org.tw>\n"
"Language-Team: Chinese Team <zh-l10n@linux.org.tw>\n"
@@ -19,7 +19,7 @@ msgstr ""
"Content-Type: text/plain; charset=big5\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../_irpm_.c:23 ../urpmi_.c:562
+#: ../_irpm_.c:23 ../urpmi_.c:561
#, c-format
msgid "installing %s\n"
msgstr "���b�w�� %s\n"
@@ -33,34 +33,34 @@ msgstr ""
"�۰ʦw�ˮM��...\n"
"�z�n�D�w�˪��M�� %s\n"
-#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:463
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:462
msgid "Is this OK?"
msgstr "�T�w�ܡH"
-#: ../_irpm_.c:35 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
-#: ../urpmi_.c:490 ../urpmi_.c:517
+#: ../_irpm_.c:35 ../urpmi_.c:374 ../urpmi_.c:416 ../urpmi_.c:465
+#: ../urpmi_.c:489 ../urpmi_.c:516
msgid "Ok"
msgstr "�T�w"
-#: ../_irpm_.c:36 ../urpmi_.c:376 ../urpmi_.c:418 ../urpmi_.c:467
-#: ../urpmi_.c:491 ../urpmi_.c:518
+#: ../_irpm_.c:36 ../urpmi_.c:375 ../urpmi_.c:417 ../urpmi_.c:466
+#: ../urpmi_.c:490 ../urpmi_.c:517
msgid "Cancel"
msgstr "����"
#. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:422
-#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:17
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:379 ../urpmi_.c:421
+#: ../urpmi_.c:470 ../urpmi_.c:521 ../urpmi_.c:585 placeholder.h:17
msgid "Nn"
msgstr "Nn(�_)"
#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:423
-#: ../urpmi_.c:472 ../urpmi_.c:523 ../urpmi_.c:587 placeholder.h:11
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:380 ../urpmi_.c:422
+#: ../urpmi_.c:471 ../urpmi_.c:522 ../urpmi_.c:586 placeholder.h:11
msgid "Yy"
msgstr "Yy(�O)"
-#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:424
-#: ../urpmi_.c:473
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:381 ../urpmi_.c:423
+#: ../urpmi_.c:472
msgid " (Y/n) "
msgstr " (Y/n) (�O/�_) "
@@ -610,7 +610,7 @@ msgid "Installation failed on node %s"
msgstr "�w�˥��� - %s"
#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
-#: ../urpmi_.c:608
+#: ../urpmi_.c:607
msgid "Installation is possible"
msgstr "�L�k�i��w��"
@@ -641,8 +641,9 @@ msgstr ""
"\n"
"�Ϊk�G\n"
-#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
+#: ../urpme_.c:44 ../urpmf_.c:31 ../urpmi.addmedia_.c:53
+#: ../urpmi.removemedia_.c:36 ../urpmi.update_.c:61 ../urpmi_.c:76
+#: ../urpmq_.c:40
msgid " --help - print this help message.\n"
msgstr " --help - ��ܦ������T���C\n"
@@ -706,6 +707,160 @@ msgstr "���F������F���M��ॿ�`����A�U�C�M��N�Q���� (%d MB)"
msgid "Removing failed"
msgstr "...�ƻs����"
+#: ../urpmf_.c:26
+#, fuzzy, c-format
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq ���� %s\n"
+"���v�Ҧ� (C) 2000, 2001, 2002 MandrakeSoft�C\n"
+"�o�O�ۥѳn��A���� GNU GPL ���ڵo�G�C\n"
+"\n"
+"�Ϊk�G\n"
+
+#: ../urpmf_.c:32 ../urpmi_.c:77 ../urpmq_.c:41
+msgid " --update - use only update media.\n"
+msgstr " --update - �u�ϥΧ�s���C���C\n"
+
+#: ../urpmf_.c:33 ../urpmi_.c:78 ../urpmq_.c:42
+msgid " --media - use only the media listed by comma.\n"
+msgstr " --media - �u�ϥΥH�r���C�X���C���C\n"
+
+#: ../urpmf_.c:34 ../urpmq_.c:43
+msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
+msgstr " --synthesis - �ϥΫ��w�� --synthesis �ɮסA�Ӥ��O urpmi db�C\n"
+
+#: ../urpmf_.c:35
+#, fuzzy
+msgid " --verbose - verbose mode.\n"
+msgstr " -v - ��ܸ�T�Ҧ��C\n"
+
+#: ../urpmf_.c:36
+#, fuzzy
+msgid ""
+" --quiet - do not print tag name (default if no tag given on "
+"command\n"
+" line, incompatible with interactive mode).\n"
+msgstr ""
+" --quiet - ����ܦb�R�O�C�ҿ�J���ﶵ�W�� (�Y���O�C���S������ﶵ��"
+
+#: ../urpmf_.c:38
+#, fuzzy
+msgid " --all - print all tags.\n"
+msgstr " --all - ��ܥ����ﶵ�Ҵ��Ѫ���T�C"
+
+#: ../urpmf_.c:39
+#, fuzzy
+msgid ""
+" --name - print tag name: rpm filename (assumed if no tag given on\n"
+" command line but without package name).\n"
+msgstr " --name - ��ܮM����W�Grpm (�Y�R�O�C���S�����w����ﶵ�A"
+
+#: ../urpmf_.c:41
+#, fuzzy
+msgid " --group - print tag group: group.\n"
+msgstr " --group - ��ܮM����ݸs�աC"
+
+#: ../urpmf_.c:42
+#, fuzzy
+msgid " --size - print tag size: size.\n"
+msgstr " --size - ��ܮM��j�p�C"
+
+#: ../urpmf_.c:43
+#, fuzzy
+msgid " --epoch - print tag epoch: epoch.\n"
+msgstr " --size - ��ܮM��j�p�C"
+
+#: ../urpmf_.c:44
+#, fuzzy
+msgid " --summary - print tag summary: summary.\n"
+msgstr " --summary - ��ܮM��K�n�C"
+
+#: ../urpmf_.c:45
+#, fuzzy
+msgid " --description - print tag description: description.\n"
+msgstr " --description - ��ܮM��ԸѸ�ơC"
+
+#: ../urpmf_.c:46
+#, fuzzy
+msgid " --provides - print tag provides: all provides (multiple lines).\n"
+msgstr ""
+" --provides - ��ܥ����������M��ήM��Ҵ��Ѫ��禡�w�G(�h�����)�C"
+
+#: ../urpmf_.c:47
+#, fuzzy
+msgid " --requires - print tag requires: all requires (multiple lines).\n"
+msgstr " --requires - ��ܥ����������M����ɮ� (�h�����)�C"
+
+#: ../urpmf_.c:48
+#, fuzzy
+msgid " --files - print tag files: all files (multiple lines).\n"
+msgstr " --files - ��ܥ��������ɮ� (�h�����)�C"
+
+#: ../urpmf_.c:49
+#, fuzzy
+msgid ""
+" --conflicts - print tag conflicts: all conflicts (multiple lines).\n"
+msgstr " --conflicts - ��ܥ������ۮe���M�� (�h�����)�C"
+
+#: ../urpmf_.c:50
+#, fuzzy
+msgid ""
+" --obsoletes - print tag obsoletes: all obsoletes (multiple lines).\n"
+msgstr " --obsoletes - ��ܥ����L�ɮM�� (�h�����)�C"
+
+#: ../urpmf_.c:51
+#, fuzzy
+msgid " -i - ignore case distinctions in any patterns.\n"
+msgstr " -f - �j��� hdlist �ɮסC\n"
+
+#: ../urpmf_.c:52 ../urpmq_.c:72
+msgid " -f - print version, release and arch with name.\n"
+msgstr " -f - ��ܪ����A�]�t�M��W�٪��o���T�H�Υ��x�����C\n"
+
+#: ../urpmf_.c:53
+#, fuzzy
+msgid " -e - include perl code directly as perl -e.\n"
+msgstr " -c - �M�����Y�֨��ؿ��C\n"
+
+#: ../urpmf_.c:54
+#, fuzzy
+msgid ""
+" -a - binary AND operator, true if both expression are true.\n"
+msgstr " -u - �p�G�w�w�˸��n�����h�����M��C\n"
+
+#: ../urpmf_.c:55
+msgid ""
+" -o - binary OR operator, true if one expression is true.\n"
+msgstr ""
+
+#: ../urpmf_.c:56
+#, fuzzy
+msgid " ! - unary NOT, true if expression is false.\n"
+msgstr " -u - �p�G�w�w�˸��n�����h�����M��C\n"
+
+#: ../urpmf_.c:57
+#, fuzzy
+msgid " ( - left parenthesis to open group expression.\n"
+msgstr " -a - ��ܩR�O�C���Ҧ��ŦX���ءC\n"
+
+#: ../urpmf_.c:58
+#, fuzzy
+msgid " ) - right parenthesis to close group expression.\n"
+msgstr " -a - ��ܩR�O�C���Ҧ��ŦX���ءC\n"
+
+#: ../urpmf_.c:114
+#, c-format
+msgid ""
+"callback is :\n"
+"%s\n"
+msgstr ""
+
#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
#. Translator: and 'removable:' must not be translated!
#. Translator: neither the ``with''.
@@ -937,14 +1092,6 @@ msgstr ""
"\n"
"�Ϊk�G\n"
-#: ../urpmi_.c:77 ../urpmq_.c:41
-msgid " --update - use only update media.\n"
-msgstr " --update - �u�ϥΧ�s���C���C\n"
-
-#: ../urpmi_.c:78 ../urpmq_.c:42
-msgid " --media - use only the media listed by comma.\n"
-msgstr " --media - �u�ϥΥH�r���C�X���C���C\n"
-
#: ../urpmi_.c:79
#, fuzzy
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
@@ -1071,39 +1218,39 @@ msgstr "urpmi�G���Ԫ��ﶵ��-%s���A�п�J --help �ﶵ�\Ū�ϥΤ�k\n"
msgid "What can be done with binary rpm files when using --install-src"
msgstr ""
-#: ../urpmi_.c:222
+#: ../urpmi_.c:221
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "�L�k�إ� [%s] �ؿ��A�L�k�Ұʯ��Φ^���\��"
-#: ../urpmi_.c:236
+#: ../urpmi_.c:235
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmi_.c:247
+#: ../urpmi_.c:246
msgid "Only superuser is allowed to install packages"
msgstr "��p�A�u���W�ŨϥΪ̤~���\�w�ˮM��"
-#: ../urpmi_.c:341
+#: ../urpmi_.c:340
#, c-format
msgid "One of the following packages is needed to install %s:"
msgstr "���n�w�ˤU�C�M�� %s�G"
-#: ../urpmi_.c:342
+#: ../urpmi_.c:341
msgid "One of the following packages is needed:"
msgstr "�ݭn�H�U�䤤�@�ӮM��G"
-#: ../urpmi_.c:350
+#: ../urpmi_.c:349
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "���@�ӬO�A����ܡS (1-%d) "
-#: ../urpmi_.c:353
+#: ../urpmi_.c:352
msgid "Sorry, bad choice, try again\n"
msgstr "�藍�_�A��ܿ��~�A�ЦA�դ@��\n"
-#: ../urpmi_.c:373
+#: ../urpmi_.c:372
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1114,31 +1261,31 @@ msgstr ""
"%s\n"
"�z�P�N�n�~��ܡH"
-#: ../urpmi_.c:396
+#: ../urpmi_.c:395
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "�L�k�w�ˤW�ӮM�� - %s"
-#: ../urpmi_.c:401
+#: ../urpmi_.c:400
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpmi_.c:403
+#: ../urpmi_.c:402
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "�䤣�� wget �{���ɮ�\n"
-#: ../urpmi_.c:408
+#: ../urpmi_.c:407
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s �M��P %s �۽Ĭ�"
-#: ../urpmi_.c:410
+#: ../urpmi_.c:409
msgid "unrequested"
msgstr ""
-#: ../urpmi_.c:415
+#: ../urpmi_.c:414
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1149,14 +1296,14 @@ msgstr ""
"%s\n"
"�z�P�N�n�~��ܡH"
-#: ../urpmi_.c:453 ../urpmi_.c:462
+#: ../urpmi_.c:452 ../urpmi_.c:461
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed (%"
"d MB)"
msgstr "���F�ϥο���F���M��ॿ�`����A�H�U���M���ݭn�@�P�w�ˡC (%d MB)"
-#: ../urpmi_.c:459
+#: ../urpmi_.c:458
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1165,32 +1312,32 @@ msgstr ""
"�z�ݭn�ϥ� root �v������ӵ{���H�K���Ʀw�ˤU�C�̩ۨʶ��ءG\n"
"%s\n"
-#: ../urpmi_.c:481 ../urpmq_.c:297
+#: ../urpmi_.c:480 ../urpmq_.c:297
msgid "unable to get source packages, aborting"
msgstr "�L�k���o��l�X�M��A���"
-#: ../urpmi_.c:487
+#: ../urpmi_.c:486
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "�бN�㦳�W�١�%s�����C����J��˸m [%s] ��"
-#: ../urpmi_.c:488
+#: ../urpmi_.c:487
msgid "Press Enter when ready..."
msgstr "������� <Enter��>�D�D"
-#: ../urpmi_.c:509
+#: ../urpmi_.c:508
msgid "The following packages have bad signatures"
msgstr "�U�C�M�󦳤��X�k��ñ�W�ɮ׸�T"
-#: ../urpmi_.c:510
+#: ../urpmi_.c:509
msgid "Do you want to continue installation ?"
msgstr "�z�n�~��i��w�˶ܡH"
-#: ../urpmi_.c:524
+#: ../urpmi_.c:523
msgid " (y/N) "
msgstr " (y/N) (�O/�_) "
-#: ../urpmi_.c:532
+#: ../urpmi_.c:531
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1198,25 +1345,25 @@ msgid ""
"You may want to update your urpmi database"
msgstr "�w�˥��ѡA�]���䤣��Y���ɮסC�z�i��n��s�z�� urpmi ��Ʈw�C"
-#: ../urpmi_.c:541 ../urpmi_.c:572 ../urpmi_.c:581 ../urpmi_.c:596
-#: ../urpmi_.c:605
+#: ../urpmi_.c:540 ../urpmi_.c:571 ../urpmi_.c:580 ../urpmi_.c:595
+#: ../urpmi_.c:604
msgid "Installation failed"
msgstr "�w�˥���"
-#: ../urpmi_.c:556
+#: ../urpmi_.c:555
#, c-format
msgid "distributing %s\n"
msgstr "���b�o�G %s \n"
-#: ../urpmi_.c:588
+#: ../urpmi_.c:587
msgid "Try installation without checking dependencies? (y/N) "
msgstr "���L�ˬd�M�󪺬̩ۨ��ˬd�j��w�ˡH(y/N)(�O/�_)"
-#: ../urpmi_.c:598
+#: ../urpmi_.c:597
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "�ϥαj��ʪ��w�ˤ覡 (--force)�H(y/N)(�O/�_)"
-#: ../urpmi_.c:613
+#: ../urpmi_.c:612
msgid "everything already installed"
msgstr "�������w�w��"
@@ -1236,10 +1383,6 @@ msgstr ""
"\n"
"�Ϊk�G\n"
-#: ../urpmq_.c:43
-msgid " --synthesis - use the synthesis given instead of urpmi db.\n"
-msgstr " --synthesis - �ϥΫ��w�� --synthesis �ɮסA�Ӥ��O urpmi db�C\n"
-
#: ../urpmq_.c:46
msgid " --list - list available packages.\n"
msgstr " --all - ��ܥi�Ϊ����M�󶵥ءC\n"
@@ -1298,10 +1441,6 @@ msgstr " -g - ��ܸs�դήM��W�١C\n"
msgid " -r - print version and release with name also.\n"
msgstr " -r - ��ܪ����B�o���T�P�M��W��\n"
-#: ../urpmq_.c:72
-msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - ��ܪ����A�]�t�M��W�٪��o���T�H�Υ��x�����C\n"
-
#: ../urpmq_.c:73
msgid " names or rpm files given on command line are queried.\n"
msgstr " �b�R�O�C�������W�٩� rpm �ɮ׳��|�Q�d�ߡC\n"
@@ -1548,11 +1687,6 @@ msgstr "�䤣��������C���M��"
#~ msgid "keeping only files referenced in provides"
#~ msgstr "�u�O�s�b���M��P�禡�w�M�桨(provides) ���������ɮ�"
-#~ msgid ""
-#~ " -u - remove package if a better version is already "
-#~ "installed.\n"
-#~ msgstr " -u - �p�G�w�w�˸��n�����h�����M��C\n"
-
#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
#~ msgstr "�C����%s�����ըϥΥ��b�ϥΤ����M��A�����o�ӴC��"